Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit 0bb319aabc7b · 2016-01-22T20:29:26.000+03:00
diff --git a/contrib/multimaster/dtmd/include/dtmdlimits.h b/contrib/multimaster/dtmd/include/dtmdlimits.h
@@ -1,5 +1,5 @@
-#ifndef LIMITS_H
-#define LIMITS_H
+#ifndef DTMD_LIMITS_H
+#define DTMD_LIMITS_H
 
 #define MAX_TRANSACTIONS 4096
 
diff --git a/contrib/multimaster/dtmd/include/snapshot.h b/contrib/multimaster/dtmd/include/snapshot.h
@@ -2,7 +2,7 @@
 #define SNAPSHOT_H
 
 #include "int.h"
-#include "limits.h"
+#include "dtmdlimits.h"
 
 typedef struct Snapshot {
 	xid_t xmin;
diff --git a/contrib/multimaster/dtmd/include/transaction.h b/contrib/multimaster/dtmd/include/transaction.h
@@ -5,7 +5,7 @@
 #include "int.h"
 #include "clog.h"
 #include "snapshot.h"
-#include "limits.h"
+#include "dtmdlimits.h"
 
 #define MAX_SNAPSHOTS_PER_TRANS 8
 
diff --git a/contrib/multimaster/dtmd/src/server.c b/contrib/multimaster/dtmd/src/server.c
@@ -21,7 +21,7 @@
 #endif
 
 #include "server.h"
-#include "limits.h"
+#include "dtmdlimits.h"
 #include "util.h"
 #include "sockhub.h"
 
diff --git a/contrib/pg_dtm/dtmd/include/limits.h b/contrib/pg_dtm/dtmd/include/limits.h
diff --git a/contrib/pg_shard/src/prune_shard_list.c b/contrib/pg_shard/src/prune_shard_list.c
@@ -127,6 +127,8 @@ PruneShardList(Oid relationId, List *whereClauseList, List *shardIntervalList)
 	List *restrictInfoList = NIL;
 	Node *baseConstraint = NULL;
 	int shardHashCode = -1;
+	int shardCount = shardIntervalList->length;
+	uint32 hashTokenIncrement = (uint32)(HASH_TOKEN_COUNT / shardCount);
 	Var *partitionColumn = PartitionColumn(relationId);
 	char partitionMethod = PartitionType(relationId);
 
@@ -168,8 +170,6 @@ PruneShardList(Oid relationId, List *whereClauseList, List *shardIntervalList)
 						if (OidIsValid(hashFunction->fn_oid))
 						{
 							int hashedValue = DatumGetInt32(FunctionCall1(hashFunction, constant->constvalue));
-							int shardCount = shardIntervalList->length;
-							uint32 hashTokenIncrement = (uint32)(HASH_TOKEN_COUNT / shardCount);
 							shardHashCode = (int)((uint32)(hashedValue - INT32_MIN) / hashTokenIncrement);
 							remainingShardList = LookupShardPlacementCache(relationId, shardHashCode);
 							if (remainingShardList != NULL)
@@ -229,7 +229,19 @@ PruneShardList(Oid relationId, List *whereClauseList, List *shardIntervalList)
 	}
 	if (shardHashCode >= 0)
 	{
-		AddToShardPlacementCache(relationId, shardHashCode, shardIntervalList->length, remainingShardList);
+		ShardInterval* shardInterval = (ShardInterval *) linitial(remainingShardList);
+		int64 shardId = shardInterval->id;
+		int32 shardMinHashToken = INT32_MIN + (shardId * hashTokenIncrement);
+		int32 shardMaxHashToken = shardMinHashToken + (hashTokenIncrement - 1);
+		if (shardId == (shardCount - 1))
+		{
+			shardMaxHashToken = INT32_MAX;
+		}
+		if (DatumGetInt32(shardInterval->minValue) == shardMinHashToken &&
+			DatumGetInt32(shardInterval->maxValue) == shardMaxHashToken)
+		{		
+			AddToShardPlacementCache(relationId, shardHashCode, shardIntervalList->length, remainingShardList);
+		}
 	}
 	return remainingShardList;
 }
