Bug#30343887: NEW COMPILATION WARNINGS WITH XCODE 11

Fix new compilation warnings that appeared with XCode 11.

The warnings are deprecation warnings about std::random_shuffle()
which was deprecated in C++14. Replace with std::shuffle().
Only affects unit tests.

Change-Id: I773f5f7c3e30afb8d62815e35d6ccdb67b54d751

Author: jhauglid

router/src/harness/include/random_generator.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License, version 2.0,
@@ -25,6 +25,7 @@
 #ifndef MYSQL_HARNESS_RANDOM_GENERATOR_INCLUDED
 #define MYSQL_HARNESS_RANDOM_GENERATOR_INCLUDED
 
+#include <random>
 #include <string>
 
 #include "harness_export.h"
@@ -78,7 +79,10 @@ class HARNESS_EXPORT RandomGeneratorInterface {
 };
 
 class HARNESS_EXPORT RandomGenerator : public RandomGeneratorInterface {
+  std::mt19937 urng;
+
  public:
+  RandomGenerator() : urng(std::random_device().operator()()) {}
   std::string generate_identifier(
       unsigned length, unsigned alphabet_mask = AlphabetAll) override;
   std::string generate_strong_password(unsigned length) override;

router/src/harness/src/random_generator.cc

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License, version 2.0,
@@ -97,7 +97,7 @@ std::string RandomGenerator::generate_strong_password(
   length -= static_cast<unsigned>(result.length());
   result += generate_identifier(length, AlphabetAll);
 
-  std::random_shuffle(result.begin(), result.end());
+  std::shuffle(result.begin(), result.end(), urng);
 
   return result;
 }

unittest/gunit/alignment-t.cc

@@ -24,6 +24,7 @@
 
 #include <gtest/gtest.h>
 #include <algorithm>
+#include <random>
 #include <vector>
 
 #include "my_byteorder.h"
@@ -51,7 +52,9 @@ class AlignmentTest : public ::testing::Test {
     for (int ix = 0; ix < num_records; ++ix) {
       aligned_data[ix] = ix / 10;
     }
-    std::random_shuffle(aligned_data, aligned_data + num_records);
+    std::random_device rng;
+    std::mt19937 urng(rng());
+    std::shuffle(aligned_data, aligned_data + num_records, urng);
     memcpy(unaligned_data + 1, aligned_data, num_records * sizeof(int));
   }
 

unittest/gunit/bounds_checked_array-t.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -22,6 +22,7 @@
 
 #include <gtest/gtest.h>
 #include <algorithm>
+#include <random>
 
 #include "sql/sql_array.h"
 
@@ -171,7 +172,9 @@ TEST_F(BoundsCheckedArray, Equality) {
 
 TEST_F(BoundsCheckedArray, Sort) {
   int_array = Int_array(c_array, c_array_size);
-  std::random_shuffle(int_array.begin(), int_array.end());
+  std::random_device rng;
+  std::mt19937 urng(rng());
+  std::shuffle(int_array.begin(), int_array.end(), urng);
   std::sort(int_array.begin(), int_array.end());
   Int_array::const_iterator it;
   int ix;

unittest/gunit/prealloced_array-t.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -26,6 +26,7 @@
 #include <gtest/gtest.h>
 #include <algorithm>
 #include <memory>
+#include <random>
 
 #include "prealloced_array.h"
 
@@ -186,7 +187,9 @@ TEST_F(PreallocedArrayTest, InsertUnique) {
     int_10.push_back(ix);
     int_10.push_back(ix);
   }
-  std::random_shuffle(int_10.begin(), int_10.end());
+  std::random_device rng;
+  std::mt19937 urng(rng());
+  std::shuffle(int_10.begin(), int_10.end(), urng);
   Prealloced_array<int, 1> unique_arr(PSI_NOT_INSTRUMENTED);
   for (int *pi = int_10.begin(); pi != int_10.end(); ++pi) {
     unique_arr.insert_unique(*pi);

unittest/gunit/priority_queue-t.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -26,6 +26,7 @@
 #include <functional>
 #include <iostream>
 #include <iterator>
+#include <random>
 #include <sstream>
 #include <vector>
 #include "my_config.h"
@@ -613,7 +614,9 @@ TEST_F(PriorityQueueTest, DifferentCtors) {
 }
 
 TEST_F(PriorityQueueTest, Swap) {
-  std::random_shuffle(keys, keys + 10);
+  std::random_device rng;
+  std::mt19937 urng(rng());
+  std::shuffle(keys, keys + 10, urng);
   Priority_queue<int> pq(keys, keys + 10);
   std::stringstream ss1, ss2;
   ss1 << pq;