From ce0a0ab81372b568facc7e42bb44365294f081b8 Mon Sep 17 00:00:00 2001 From: Jason Petersen Date: Tue, 6 Sep 2016 11:07:27 -0500 Subject: [PATCH] Add sort call to shard placement test The comparator is kind of broken, but I think this is better than the current state of random failures. --- src/backend/distributed/test/distribution_metadata.c | 4 ++++ src/test/regress/expected/multi_distribution_metadata.out | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/backend/distributed/test/distribution_metadata.c b/src/backend/distributed/test/distribution_metadata.c index f91fe780c..8c6f9e85a 100644 --- a/src/backend/distributed/test/distribution_metadata.c +++ b/src/backend/distributed/test/distribution_metadata.c @@ -19,10 +19,12 @@ #include "access/heapam.h" #include "catalog/pg_type.h" +#include "distributed/listutils.h" #include "distributed/master_metadata_utility.h" #include "distributed/master_protocol.h" #include "distributed/metadata_cache.h" #include "distributed/multi_join_order.h" +#include "distributed/multi_physical_planner.h" #include "distributed/pg_dist_shard.h" #include "distributed/resource_lock.h" #include "distributed/test_helper_functions.h" /* IWYU pragma: keep */ @@ -144,6 +146,8 @@ load_shard_placement_array(PG_FUNCTION_ARGS) placementList = ShardPlacementList(shardId); } + placementList = SortList(placementList, CompareShardPlacements); + placementCount = list_length(placementList); placementDatumArray = palloc0(placementCount * sizeof(Datum)); diff --git a/src/test/regress/expected/multi_distribution_metadata.out b/src/test/regress/expected/multi_distribution_metadata.out index 5cc8c5473..d2a0b2144 100644 --- a/src/test/regress/expected/multi_distribution_metadata.out +++ b/src/test/regress/expected/multi_distribution_metadata.out @@ -128,7 +128,7 @@ ERROR: could not find valid entry for shard 540005 SELECT load_shard_placement_array(540001, false); load_shard_placement_array ----------------------------------- - {localhost:57637,localhost:57638} + {localhost:57638,localhost:57637} (1 row) -- only one of which is finalized @@ -142,7 +142,7 @@ SELECT load_shard_placement_array(540001, true); SELECT load_shard_placement_array(540001, false); load_shard_placement_array ----------------------------------- - {localhost:57637,localhost:57638} + {localhost:57638,localhost:57637} (1 row) -- should see column id of 'name'