From nobody Sun Nov 10 11:32:14 2024
X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
	by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XmVrt125qz5cdPc;
	Sun, 10 Nov 2024 11:32:14 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (4096 bits) client-digest SHA256)
	(Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 4XmVrt0t6Dz4hpj;
	Sun, 10 Nov 2024 11:32:14 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1731238334;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=n+SiSRwnZXvPYidVPWLwjWeG6ZB8Whh9yLdtoEp43po=;
	b=ekRff5K3jDw24uPftAwPJAYd1SB0HvzbFR749/pCb8kh6WaKQB+I3peLXEC3g/xcQ6Ugm7
	BrXx1sd7ewVBZHCE0kf7OjfZS2oePsizZnWaAnPl31t/kFCLNpgWXJLnFNq8Racz8lQl12
	5CBLw3IZLSh4mJsNvwSdybgqky3lwK4YZbXsZ753vtEoaWWkLDjfDSkHV32+lOl5eo13If
	tSzMF6t4nG8p/cUuXfRYmUuF9UKhTz8ZXap/3XfFGg559zY40B5YYrVYxR+2xUmkMG8Jmu
	RkpZN48fD7wmctvzR7fkQw7NllgU+Gcg3XOrbDVTxheSlVZ756Byks65W/vxDw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1731238334;
	h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
	 to:to:cc:mime-version:mime-version:content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding;
	bh=n+SiSRwnZXvPYidVPWLwjWeG6ZB8Whh9yLdtoEp43po=;
	b=kfOyb/YJedmKLXyBBkAPGpLprNiO0AU7m/CslBsjDAwdAAjdWIUZlSiExhY6kfMLVCWzGo
	IwSBd4xBOONjRoeVhUsFHSuOtu+GgEEUEK258NabWT0MBTT494afc+rVQdR+9j88fxjA3P
	N/We/7NpdUDZquOqGno7ea6/ukj9cIYqRN6blktsA6J6coj9BTBzgMR7fVO/3k4XyUQb8f
	fQrlq5dF06N+i1tgngH+ZhSkUrroYjuJYtm62q7ZkZ213EwMR2JmX7fPEUjbQyI3xhJKMX
	rcubHgnkEI5qoEDIkUjDKQ1ktZNpSL5u3JZNPWVfFDmI+o9b3vDyQV1n8idlig==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731238334; a=rsa-sha256; cv=none;
	b=pIk3HviL49X11C7k5qCkpk1fewzKYPzIXdIqeGYA+e6zBhJlA/NxKyYaJ40Hb9VgX1qz2e
	fXtO2oDsObiqm+hOYzCpaNOMtzf+D5CMmCXCxU6Xs5xzNKMYh8PGZiZe7Gu+69iyMF46oR
	Ypl7Ibd/Ut/ErwJq3k6tFqSbz6NfXOxv1CTwfmvIlq/uDO2s8fL7tqnkzv/1XQg6bcoH6e
	GmBNccHdLWvlzEOM5EbOdifeexrEAxtaZhur7uABACZPhyB4A5klPTvs0c5Ojvc8ctDaMx
	uZtdR8OdF4Gfyu2Pu7ZmTTQkGeAjWxfbDjJlSjCVs78ZQLAhg219rgIgpBhlSQ==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
	(Client did not present a certificate)
	by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XmVrt0V1yzgxn;
	Sun, 10 Nov 2024 11:32:14 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
	by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AABWEoX036802;
	Sun, 10 Nov 2024 11:32:14 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AABWEom036799;
	Sun, 10 Nov 2024 11:32:14 GMT
	(envelope-from git)
Date: Sun, 10 Nov 2024 11:32:14 GMT
Message-Id: <202411101132.4AABWEom036799@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
        dev-commits-ports-main@FreeBSD.org
From: Bernard Spil <brnrd@FreeBSD.org>
Subject: git: e85a453a750d - main - databases/mariadb114-server:
  Remove spurious file
List-Id: Commit messages for all branches of the ports repository <dev-commits-ports-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all
List-Help: <mailto:dev-commits-ports-all+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-all+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-ports-all@freebsd.org
Sender: owner-dev-commits-ports-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: brnrd
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: e85a453a750d6f030327d497ac1ce2949174410c
Auto-Submitted: auto-generated

The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e85a453a750d6f030327d497ac1ce2949174410c

commit e85a453a750d6f030327d497ac1ce2949174410c
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-11-10 11:32:11 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-11-10 11:32:11 +0000

    databases/mariadb114-server: Remove spurious file
---
 .../patch-storage_columnstore-tr1                  | 689 ---------------------
 1 file changed, 689 deletions(-)

diff --git a/databases/mariadb114-server/patch-storage_columnstore-tr1 b/databases/mariadb114-server/patch-storage_columnstore-tr1
deleted file mode 100644
index 863acf8fe0c5..000000000000
--- a/databases/mariadb114-server/patch-storage_columnstore-tr1
+++ /dev/null
@@ -1,689 +0,0 @@
---- storage/columnstore/columnstore/datatypes/mcs_datatype.cpp.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/datatypes/mcs_datatype.cpp
-@@ -19,12 +19,12 @@
- #include <string>
- #include <iostream>
- #include <stack>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <fstream>
- #include <sstream>
- #include <cerrno>
- #include <cstring>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- #include <utility>
- #include <cassert>
- using namespace std;
---- storage/columnstore/columnstore/dbcon/joblist/largehashjoin.h.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/joblist/largehashjoin.h
-@@ -32,7 +32,7 @@
- #include <sstream>
- #include <vector>
- #include <list>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include <boost/thread.hpp>
- #include <boost/scoped_array.hpp>
---- storage/columnstore/columnstore/dbcon/joblist/lbidlist.h.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/joblist/lbidlist.h
-@@ -31,7 +31,7 @@
- #include "bytestream.h"
- #include <iostream>
- #include "brm.h"
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- namespace joblist
- {
---- storage/columnstore/columnstore/dbcon/joblist/primitivestep.h.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/joblist/primitivestep.h
-@@ -33,7 +33,7 @@
- #include <map>
- #include <stdexcept>
- #include <sstream>
--#include <tr1/memory>
-+#include <memory>
- 
- #include <boost/shared_ptr.hpp>
- 
---- storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp
-@@ -22,7 +22,7 @@
- #include <cassert>
- #include <sstream>
- #include <iomanip>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- using namespace std;
- 
- #include <boost/shared_ptr.hpp>
---- storage/columnstore/columnstore/dbcon/joblist/tupleunion.h.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/joblist/tupleunion.h
-@@ -28,7 +28,7 @@
- //
- 
- #include "jobstep.h"
--#include <tr1/unordered_set>
-+#include <unordered_set>
- 
- #include "stlpoolallocator.h"
- #include "threadnaming.h"
---- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp
-@@ -25,13 +25,13 @@
- #include <string>
- #include <iostream>
- #include <stack>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <fstream>
- #include <sstream>
- #include <cerrno>
- #include <cstring>
- #include <regex>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- #include <utility>
- #include <cassert>
- using namespace std;
---- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp
-@@ -25,8 +25,8 @@
- #include <string>
- #include <iostream>
- #include <stack>
--#include <tr1/unordered_map>
--#include <tr1/unordered_set>
-+#include <unordered_map>
-+#include <unordered_set>
- #include <fstream>
- #include <sstream>
- #include <cerrno>
---- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp
-@@ -21,8 +21,8 @@
- #include <string>
- #include <iostream>
- #include <stack>
--#include <tr1/unordered_map>
--#include <tr1/unordered_set>
-+#include <unordered_map>
-+#include <unordered_set>
- #include <fstream>
- #include <sstream>
- #include <cerrno>
---- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl.cpp.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl.cpp
-@@ -22,8 +22,8 @@
- #include <string>
- #include <iostream>
- #include <stack>
--#include <tr1/unordered_map>
--#include <tr1/unordered_set>
-+#include <unordered_map>
-+#include <unordered_set>
- #include <fstream>
- #include <sstream>
- #include <cerrno>
---- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_impl_if.h
-@@ -21,7 +21,7 @@
- #include <bitset>
- #include <string>
- #include <stdint.h>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <iosfwd>
- #include <boost/shared_ptr.hpp>
- #include <stack>
---- storage/columnstore/columnstore/dbcon/mysql/ha_mcs_udf.cpp.orig	2024-05-26 18:15:40 UTC
-+++ storage/columnstore/columnstore/dbcon/mysql/ha_mcs_udf.cpp
-@@ -21,7 +21,7 @@
-  */
- 
- #include <my_config.h>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- using namespace std;
- 
- #include "idb_mysql.h"
---- storage/columnstore/columnstore/primitives/blockcache/filebuffermgr.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/primitives/blockcache/filebuffermgr.h
-@@ -26,7 +26,7 @@
- #include <iostream>
- #include <fstream>
- #include <iomanip>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- #include <boost/thread.hpp>
- #include <deque>
- 
---- storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp
-@@ -48,8 +48,8 @@
- #include <stdlib.h>
- #include <string>
- #include <sstream>
--#include <tr1/unordered_map>
--#include <tr1/unordered_set>
-+#include <unordered_map>
-+#include <unordered_set>
- #include <set>
- #include <sys/types.h>
- #include <sys/stat.h>
---- storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h
-@@ -27,7 +27,7 @@
- 
- #include <stdexcept>
- #include <vector>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- 
- #define POSIX_REGEX
- 
---- storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.h
-@@ -33,7 +33,7 @@
- #include <boost/scoped_array.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/scoped_ptr.hpp>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <boost/thread.hpp>
- 
- #include "errorcodes.h"
---- storage/columnstore/columnstore/primitives/primproc/bppseeder.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/primitives/primproc/bppseeder.h
-@@ -34,7 +34,7 @@
- #include <iostream>
- #include <iomanip>
- #include <unistd.h>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <boost/shared_ptr.hpp>
- 
- #include "batchprimitiveprocessor.h"
---- storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp
-@@ -36,8 +36,8 @@
- #include <boost/thread.hpp>
- #include <boost/thread/condition.hpp>
- #include <boost/foreach.hpp>
--#include <tr1/unordered_map>
--#include <tr1/unordered_set>
-+#include <unordered_map>
-+#include <unordered_set>
- #include <pthread.h>
- #include <cerrno>
- 
---- storage/columnstore/columnstore/primitives/primproc/primitiveserver.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/primitives/primproc/primitiveserver.h
-@@ -25,8 +25,8 @@
- #pragma once
- 
- #include <map>
--#include <tr1/unordered_map>
--#include <tr1/unordered_set>
-+#include <unordered_map>
-+#include <unordered_set>
- #include <unordered_map>
- #include <boost/thread.hpp>
- 
---- storage/columnstore/columnstore/primitives/primproc/primproc.cpp.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/primitives/primproc/primproc.cpp
-@@ -31,7 +31,7 @@
- #include <csignal>
- #include <sys/time.h>
- #include <sys/resource.h>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- 
- #include <clocale>
- #include <iterator>
---- storage/columnstore/columnstore/storage-manager/src/SessionManager.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/storage-manager/src/SessionManager.h
-@@ -23,7 +23,7 @@
- #include <signal.h>
- #include <boost/thread/mutex.hpp>
- #include <sys/poll.h>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- namespace storagemanager
- {
---- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig	2022-05-18 08:34:17 UTC
-+++ storage/columnstore/columnstore/utils/common/threadnaming.cpp
-@@ -22,13 +22,21 @@ namespace utils
- {
- void setThreadName(const char* threadName)
- {
-+#ifdef __FreeBSD__
-+  pthread_set_name_np(pthread_self(), threadName);
-+#else
-   prctl(PR_SET_NAME, threadName, 0, 0, 0);
-+#endif
- }
- 
- std::string getThreadName()
- {
-   char buf[32];
-+#ifdef __FreeBSD__
-+  pthread_get_name_np(pthread_self(), buf, sizeof(buf));
-+#else
-   prctl(PR_GET_NAME, buf, 0, 0, 0);
-+#endif
-   return std::string(buf);
- }
- }  // namespace utils
---- storage/columnstore/columnstore/utils/configcpp/configcpp.cpp.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/configcpp/configcpp.cpp
-@@ -57,7 +57,7 @@ namespace fs = boost::filesystem;
- 
- #include "exceptclasses.h"
- #include "installdir.h"
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "bytestream.h"
- 
---- storage/columnstore/columnstore/utils/configcpp/writeonce.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/configcpp/writeonce.h
-@@ -25,7 +25,7 @@
- #pragma once
- 
- #include <string>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include <stddef.h>
- 
---- storage/columnstore/columnstore/utils/funcexp/funcexp.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/funcexp/funcexp.h
-@@ -26,7 +26,7 @@
- 
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <boost/thread/mutex.hpp>
- 
- #include "rowgroup.h"
---- storage/columnstore/columnstore/utils/joiner/joiner.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/joiner/joiner.h
-@@ -21,7 +21,7 @@
- #include <vector>
- #include <boost/shared_ptr.hpp>
- 
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "../common/simpleallocator.h"
- #include "../joblist/elementtype.h"
---- storage/columnstore/columnstore/utils/joiner/tuplejoiner.cpp.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/joiner/tuplejoiner.cpp
-@@ -20,7 +20,7 @@
- #include <algorithm>
- #include <vector>
- #include <limits>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- 
- #include "hasher.h"
- #include "lbidlist.h"
---- storage/columnstore/columnstore/utils/joiner/tuplejoiner.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/joiner/tuplejoiner.h
-@@ -24,7 +24,7 @@
- #include <boost/scoped_ptr.hpp>
- 
- #include <boost/scoped_array.hpp>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "rowgroup.h"
- #include "joiner.h"
---- storage/columnstore/columnstore/utils/regr/corr.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/corr.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/covar_pop.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/covar_pop.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/covar_samp.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/covar_samp.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_avgx.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_avgx.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_avgy.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_avgy.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_count.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_count.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_intercept.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_intercept.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_r2.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_r2.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_slope.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_slope.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_sxx.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_sxx.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_sxy.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_sxy.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/regr/regr_syy.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/regr/regr_syy.h
-@@ -33,7 +33,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/rowgroup/rowaggregation.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/rowgroup/rowaggregation.h
-@@ -32,8 +32,8 @@
- #include <cstdint>
- #include <utility>
- #include <vector>
--#include <tr1/unordered_map>
--#include <tr1/unordered_set>
-+#include <unordered_map>
-+#include <unordered_set>
- #include <boost/shared_ptr.hpp>
- 
- #include <boost/scoped_array.hpp>
---- storage/columnstore/columnstore/utils/rwlock/rwlock.cpp.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/rwlock/rwlock.cpp
-@@ -26,7 +26,7 @@
- #include <string>
- #include <sstream>
- #include <iomanip>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #ifndef NDEBUG
- #define NDEBUG
---- storage/columnstore/columnstore/utils/testbc/filebuffermgr.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/testbc/filebuffermgr.h
-@@ -27,7 +27,7 @@
- #include "blocksize.h"
- #include "filebuffer.h"
- #include "rwlock_local.h"
--#include <tr1/unordered_set>
-+#include <unordered_set>
- #include <boost/thread.hpp>
- 
- /**
---- storage/columnstore/columnstore/utils/udfsdk/allnull.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/udfsdk/allnull.h
-@@ -47,7 +47,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/udfsdk/avg_mode.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/udfsdk/avg_mode.h
-@@ -55,7 +55,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/udfsdk/avgx.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/udfsdk/avgx.h
-@@ -34,7 +34,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/udfsdk/mcsv1_udaf.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/udfsdk/mcsv1_udaf.h
-@@ -67,7 +67,7 @@
- #include <vector>
- #include <map>
- #include <boost/shared_ptr.hpp>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include "any.hpp"
- #include "calpontsystemcatalog.h"
- #include "wf_frame.h"
---- storage/columnstore/columnstore/utils/udfsdk/median.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/udfsdk/median.h
-@@ -55,7 +55,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/udfsdk/ssq.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/udfsdk/ssq.h
-@@ -55,7 +55,7 @@
- #include <cstdlib>
- #include <string>
- #include <vector>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- 
- #include "mcsv1_udaf.h"
- #include "calpontsystemcatalog.h"
---- storage/columnstore/columnstore/utils/windowfunction/idborderby.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/windowfunction/idborderby.h
-@@ -29,7 +29,7 @@
- 
- #include <boost/scoped_ptr.hpp>
- 
--#include <tr1/unordered_set>
-+#include <unordered_set>
- 
- #include "rowgroup.h"
- #include "hasher.h"
---- storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h
-@@ -19,7 +19,7 @@
- 
- #pragma once
- 
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include "windowfunctiontype.h"
- #include "mcsv1_udaf.h"
- 
---- storage/columnstore/columnstore/versioning/BRM/brmtypes.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/versioning/BRM/brmtypes.h
-@@ -33,7 +33,7 @@
- #include "mcs_basic_types.h"
- #include "logicalpartition.h"
- 
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #ifndef _UNORDERED_MAP_FIX_
- #define _UNORDERED_MAP_FIX_
- #endif  //_UNORDERED_MAP_FIX_
---- storage/columnstore/columnstore/versioning/BRM/extentmap.cpp.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/versioning/BRM/extentmap.cpp
-@@ -38,7 +38,7 @@
- #include <boost/scoped_array.hpp>
- #include <boost/scoped_ptr.hpp>
- #include <boost/thread.hpp>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- 
- #include <boost/interprocess/shared_memory_object.hpp>
- #include <boost/interprocess/mapped_region.hpp>
---- storage/columnstore/columnstore/versioning/BRM/extentmap.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/versioning/BRM/extentmap.h
-@@ -31,7 +31,7 @@
- #include <vector>
- #include <set>
- #include <unordered_map>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <mutex>
- 
- // #define NDEBUG
---- storage/columnstore/columnstore/versioning/BRM/lbidresourcegraph.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/versioning/BRM/lbidresourcegraph.h
-@@ -28,7 +28,7 @@
- 
- #include <map>
- #include <set>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- #include <boost/thread.hpp>
- 
- #include "brmtypes.h"
---- storage/columnstore/columnstore/writeengine/bulk/we_colextinf.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/writeengine/bulk/we_colextinf.h
-@@ -30,7 +30,7 @@
- #include <limits>
- #include <stdint.h>
- #include <set>
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <boost/thread/mutex.hpp>
- 
- #include "brmtypes.h"
---- storage/columnstore/columnstore/writeengine/bulk/we_extentstripealloc.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/writeengine/bulk/we_extentstripealloc.h
-@@ -29,7 +29,7 @@
- #include <string>
- #include <vector>
- 
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #include <boost/thread/mutex.hpp>
- 
- #include "we_type.h"
---- storage/columnstore/columnstore/writeengine/shared/we_cache.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/writeengine/shared/we_cache.h
-@@ -26,7 +26,7 @@
- #if __GNUC__ == 4 && __GNUC_MINOR__ < 2
- #include <ext/hash_map>
- #else
--#include <tr1/unordered_map>
-+#include <unordered_map>
- #endif
- #include <map>
- 
---- storage/columnstore/columnstore/writeengine/wrapper/writeengine.h.orig	2024-05-26 18:15:41 UTC
-+++ storage/columnstore/columnstore/writeengine/wrapper/writeengine.h
-@@ -29,7 +29,7 @@
- #include <fcntl.h>
- // end
- #include <boost/lexical_cast.hpp>
--#include <tr1/unordered_set>
-+#include <unordered_set>
- 
- #include "we_brm.h"
- #include "we_colop.h"