From 5fe9a9129088793ef8e4c433d21c77b4e2423c07 Mon Sep 17 00:00:00 2001
From: Andrew Hutchings <andrew@linuxjedi.co.uk>
Date: Mon, 25 Jun 2018 11:17:50 +0100
Subject: [PATCH] MCOL-1496 Fix array bug in joiner

Found using -D_GLIBCXX_ASSERTIONS
---
 utils/joiner/tuplejoiner.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/joiner/tuplejoiner.cpp b/utils/joiner/tuplejoiner.cpp
index 671e63466..b8dc2937f 100644
--- a/utils/joiner/tuplejoiner.cpp
+++ b/utils/joiner/tuplejoiner.cpp
@@ -131,7 +131,7 @@ TupleJoiner::TupleJoiner(
 	cpValues.reset(new vector<int64_t>[smallKeyColumns.size()]);
 	for (uint32_t i = 0; i < smallKeyColumns.size(); i++) {
 		discreteValues[i] = false;
-        if (isUnsigned(smallRG.getColType(i)))
+        if (isUnsigned(smallRG.getColTypes()[smallKeyColumns[i]]))
         {
             cpValues[i].push_back(static_cast<int64_t>(numeric_limits<uint64_t>::max()));
             cpValues[i].push_back(0);
@@ -859,7 +859,7 @@ boost::shared_ptr<TupleJoiner> TupleJoiner::copyForDiskJoin()
 	ret->cpValues.reset(new vector<int64_t>[smallKeyColumns.size()]);
 	for (uint32_t i = 0; i < smallKeyColumns.size(); i++) {
 		ret->discreteValues[i] = false;
-        if (isUnsigned(smallRG.getColType(i)))
+        if (isUnsigned(smallRG.getColTypes()[smallKeyColumns[i]]))
         {
             ret->cpValues[i].push_back(static_cast<int64_t>(numeric_limits<uint64_t>::max()));
             ret->cpValues[i].push_back(0);