Merge remote-tracking branch 'origin/develop' into feature-issue#12

.gitignore

@@ -5,10 +5,18 @@
 # Object files
 *.o
 *.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
 
 # Libraries
 *.lib
 *.a
+*.la
+*.lo
 
 # Shared objects (inc. Windows DLLs)
 *.dll
@@ -20,6 +28,19 @@
 *.exe
 *.out
 *.app
+*.i*86
+*.x86_64
+*.hex
+
+# ========
+# = Gcov =
+# ========
+
+# gcc coverage testing tool files
+
+*.gcno
+*.gcda
+*.gcov
 
 # ====================
 # = Project-Specific =

.travis.yml

@@ -0,0 +1,20 @@
+language: c
+cache: apt
+env:
+  global:
+    - enable_coverage=yes
+  matrix:
+    - PGVERSION=9.4
+before_install:
+  - sudo apt-get update -qq
+  - sudo update-alternatives --remove-all postmaster.1.gz
+  - git clone --depth 1 https://gist.github.com/9963879.git tools
+  - tools/nuke_pg.sh
+install:
+  - sudo pip install cpp-coveralls
+  - tools/install_pg.sh
+before_script: tools/config_and_start_cluster.sh
+script: tools/pg_travis_test.sh
+after_success:
+  - sudo chmod 666 *.gcda
+  - coveralls --exclude test --exclude ruleutils_93.c --exclude ruleutils_94.c

Makefile

@@ -50,6 +50,12 @@ REGRESS_OPTS = --launcher=./launcher.sh
 
 EXTRA_CLEAN += ${REGRESS_PREP}
 
+ifeq ($(enable_coverage),yes)
+	PG_CPPFLAGS += --coverage
+	SHLIB_LINK  += --coverage
+	EXTRA_CLEAN += *.gcno *.gcda test/*.gcno test/*.gcda
+endif
+
 # Let the test's makefile tell us what objects to build.
 include test/Makefile
 

README.md

@@ -1,5 +1,10 @@
 # pg_shard
 
+[![Build Status](https://img.shields.io/travis/citusdata/pg_shard.svg)][status]
+[![Coverage](https://img.shields.io/coveralls/citusdata/pg_shard.svg)][coverage]
+[![Release](https://img.shields.io/github/release/citusdata/pg_shard.svg)][release]
+[![License](https://img.shields.io/:license-LGPLv3-blue.svg)][license]
+
 `pg_shard` is a sharding extension for PostgreSQL. It shards and replicates your PostgreSQL tables for horizontal scale and high availability. The extension also seamlessly distributes your SQL statements, without requiring any changes to your application.
 
 As a standalone extension, `pg_shard` addresses many NoSQL use cases. It also enables real-time analytics, and has an easy upgrade path to [CitusDB](http://citusdata.com/) for complex analytical workloads (distributed joins). Further, the extension provides access to standard SQL tools, and powerful PostgreSQL features, such as diverse set of indexes and semi-structured data types.
@@ -154,4 +159,9 @@ the terms of the GNU Lesser General Public License as published by the Free
 Software Foundation, either version 3 of the License, or (at your option) any
 later version.
 
-See the [`LICENSE`](LICENSE) file for full details.
+See the [`LICENSE`][license] file for full details.
+
+[status]: https://travis-ci.org/citusdata/pg_shard
+[coverage]: https://coveralls.io/r/citusdata/pg_shard
+[release]: https://github.com/citusdata/pg_shard/releases/latest
+[license]: LICENSE

expected/queries.out

@@ -184,3 +184,11 @@ SELECT author_id, sum(word_count) AS corpus_size FROM articles
          6 |       50867
 (5 rows)
 
+-- verify temp tables used by cross-shard queries do not persist
+SELECT COUNT(*) FROM pg_class WHERE relname LIKE 'pg_shard_temp_table%' AND
+									relkind = 'r';
+ count 
+-------
+     0
+(1 row)
+

expected/repair_shards.out.tmpl

@@ -13,13 +13,13 @@ INSERT INTO pgs_distribution_metadata.shard_placement
 	(id, node_name, node_port, shard_id, shard_state)
 VALUES
 	(200, 'localhost', $PGPORT, 20, 1),
-	(201, 'localhost.', $PGPORT, 20, 3);
+	(201, '127.0.0.1', $PGPORT, 20, 3);
 CREATE TABLE customer_engagements_20 ( LIKE customer_engagements );
 \o /dev/null
 SELECT 'customer_engagements_20'::regclass::oid AS shardoid;
 \gset
 \o
-SELECT master_copy_shard_placement(20, 'localhost', $PGPORT, 'localhost.', $PGPORT);
+SELECT master_copy_shard_placement(20, 'localhost', $PGPORT, '127.0.0.1', $PGPORT);
 ERROR:  shard placement repair not fully implemented
 \o /dev/null
 SELECT 'customer_engagements_20'::regclass::oid AS repairedoid;
@@ -47,7 +47,7 @@ INSERT INTO pgs_distribution_metadata.shard_placement
 	(id, node_name, node_port, shard_id, shard_state)
 VALUES
 	(300, 'localhost', $PGPORT, 30, 1),
-	(301, 'localhost.', $PGPORT, 30, 3);
+	(301, '127.0.0.1', $PGPORT, 30, 3);
 CREATE FOREIGN TABLE remote_engagements_30 (
 	id integer,
 	created_at date,
@@ -57,7 +57,7 @@ CREATE FOREIGN TABLE remote_engagements_30 (
 SELECT 'remote_engagements_30'::regclass::oid AS shardoid;
 \gset
 \o
-SELECT master_copy_shard_placement(30, 'localhost', $PGPORT, 'localhost.', $PGPORT);
+SELECT master_copy_shard_placement(30, 'localhost', $PGPORT, '127.0.0.1', $PGPORT);
 ERROR:  shard placement repair not fully implemented
 \o /dev/null
 SELECT 'remote_engagements_30'::regclass::oid AS repairedoid;

pg_shard.c

@@ -869,6 +869,7 @@ CreateTemporaryTableLikeStmt(Oid sourceRelationId)
 	  createStmt = makeNode(CreateStmt);
 	  createStmt->relation = clonedRelation;
 	  createStmt->tableElts = list_make1(tableLikeClause);
+	  createStmt->oncommit = ONCOMMIT_DROP;
 
 	  return createStmt;
 }

sql/create_shards.sql.tmpl

@@ -96,4 +96,4 @@ SELECT master_create_worker_shards('foreign_table_to_distribute', 16, 1);
 
 SELECT storage, min_value, max_value FROM pgs_distribution_metadata.shard
 	WHERE relation_id = 'foreign_table_to_distribute'::regclass
-	ORDER BY (min_value COLLATE "C") ASC;
+	ORDER BY (min_value COLLATE "C") ASC;

sql/queries.sql

@@ -121,3 +121,8 @@ SELECT author_id, sum(word_count) AS corpus_size FROM articles
 	HAVING sum(word_count) > 25000
 	ORDER BY sum(word_count) DESC
 	LIMIT 5;
+
+-- verify temp tables used by cross-shard queries do not persist
+SELECT COUNT(*) FROM pg_class WHERE relname LIKE 'pg_shard_temp_table%' AND
+									relkind = 'r';
+

sql/repair_shards.sql.tmpl

@@ -17,7 +17,7 @@ INSERT INTO pgs_distribution_metadata.shard_placement
 	(id, node_name, node_port, shard_id, shard_state)
 VALUES
 	(200, 'localhost', $PGPORT, 20, 1),
-	(201, 'localhost.', $PGPORT, 20, 3);
+	(201, '127.0.0.1', $PGPORT, 20, 3);
 
 CREATE TABLE customer_engagements_20 ( LIKE customer_engagements );
 
@@ -26,7 +26,7 @@ SELECT 'customer_engagements_20'::regclass::oid AS shardoid;
 \gset
 \o
 
-SELECT master_copy_shard_placement(20, 'localhost', $PGPORT, 'localhost.', $PGPORT);
+SELECT master_copy_shard_placement(20, 'localhost', $PGPORT, '127.0.0.1', $PGPORT);
 
 \o /dev/null
 SELECT 'customer_engagements_20'::regclass::oid AS repairedoid;
@@ -54,7 +54,7 @@ INSERT INTO pgs_distribution_metadata.shard_placement
 	(id, node_name, node_port, shard_id, shard_state)
 VALUES
 	(300, 'localhost', $PGPORT, 30, 1),
-	(301, 'localhost.', $PGPORT, 30, 3);
+	(301, '127.0.0.1', $PGPORT, 30, 3);
 
 CREATE FOREIGN TABLE remote_engagements_30 (
 	id integer,
@@ -67,7 +67,7 @@ SELECT 'remote_engagements_30'::regclass::oid AS shardoid;
 \gset
 \o
 
-SELECT master_copy_shard_placement(30, 'localhost', $PGPORT, 'localhost.', $PGPORT);
+SELECT master_copy_shard_placement(30, 'localhost', $PGPORT, '127.0.0.1', $PGPORT);
 
 \o /dev/null
 SELECT 'remote_engagements_30'::regclass::oid AS repairedoid;

test/create_shards.c

@@ -24,6 +24,10 @@
 #include "nodes/pg_list.h"
 
 
+/* local function forward declarations */
+static int CompareStrings(const void *leftElement, const void *rightElement);
+
+
 /* declarations for dynamic loading */
 PG_FUNCTION_INFO_V1(sort_names);
 PG_FUNCTION_INFO_V1(create_table_then_fail);
@@ -40,7 +44,7 @@ sort_names(PG_FUNCTION_ARGS)
 	char *second = PG_GETARG_CSTRING(1);
 	char *third = PG_GETARG_CSTRING(2);
 	List *nameList = SortList(list_make3(first, second, third),
-	                          (int (*)(const void *, const void *)) &strcmp);
+	                          (int (*)(const void *, const void *)) &CompareStrings);
 	StringInfo sortedNames = makeStringInfo();
 
 	ListCell *nameCell = NULL;
@@ -72,3 +76,15 @@ create_table_then_fail(PG_FUNCTION_ARGS)
 
 	PG_RETURN_BOOL(commandsExecuted);
 }
+
+/*
+ * A simple wrapper around strcmp suitable for use with SortList or qsort.
+ */
+static int
+CompareStrings(const void *leftElement, const void *rightElement)
+{
+	const char *leftString = *((const char **) leftElement);
+	const char *rightString = *((const char **) rightElement);
+
+	return strcmp(leftString, rightString);
+}