git: b642a89b8ae7 - main - databases/mariadb114-server: Remove unfinished port

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Tue, 27 Aug 2024 07:01:51 UTC
The branch main has been updated by brnrd:

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

commit b642a89b8ae7a403993a4da7171007d03b65da27
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-08-25 10:57:08 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-08-27 07:01:36 +0000

    databases/mariadb114-server: Remove unfinished port
    
    Reported by:    antoine
---
 databases/mariadb114-connector-c/Makefile          |  12 -
 databases/mariadb114-connector-c/distinfo          |   3 -
 databases/mariadb114-connector-c/pkg-descr         |   6 -
 databases/mariadb114-connector-c/pkg-plist         | 150 -----
 .../files/patch-storage_columnstore-tr1            | 689 ---------------------
 5 files changed, 860 deletions(-)

diff --git a/databases/mariadb114-connector-c/Makefile b/databases/mariadb114-connector-c/Makefile
deleted file mode 100644
index 15501b91c787..000000000000
--- a/databases/mariadb114-connector-c/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-PORTNAME=	mariadb
-PKGNAMESUFFIX=	114-connector-c
-
-COMMENT=	Multithreaded SQL database (client)
-
-MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-connector-c/-server/}
-
-LICENSE_FILE?=	${WRKSRC}/COPYING.LIB
-
-PLIST=		${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb114-connector-c/distinfo b/databases/mariadb114-connector-c/distinfo
deleted file mode 100644
index d501ccd5997a..000000000000
--- a/databases/mariadb114-connector-c/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1703845639
-SHA256 (mariadb-connector-c-3.3.8-src.tar.gz) = f9f076b4aa9fb22cc94b24f82c80f9ef063805ecd6533a2eb5d5060cf93833e8
-SIZE (mariadb-connector-c-3.3.8-src.tar.gz) = 1393368
diff --git a/databases/mariadb114-connector-c/pkg-descr b/databases/mariadb114-connector-c/pkg-descr
deleted file mode 100644
index 258f2007a9b0..000000000000
--- a/databases/mariadb114-connector-c/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-The MariaDB Connector/C is used to connect applications developed in C/C++
-to MariaDB and MySQL databases. MySQL Connector/C is LGPL licensed.
-
-Parts of MariaDB Connector/C are derived from PHP\'s mysqlnd extension and
-the original LGPL MySQL client library for MySQL 3.23. The rest of the code
-is written by developers at MariaDB Corporation Ab.
diff --git a/databases/mariadb114-connector-c/pkg-plist b/databases/mariadb114-connector-c/pkg-plist
deleted file mode 100644
index 5ebcc5330524..000000000000
--- a/databases/mariadb114-connector-c/pkg-plist
+++ /dev/null
@@ -1,150 +0,0 @@
-bin/mariadb_config
-include/mariadb/errmsg.h
-include/mariadb/ma_list.h
-include/mariadb/ma_pvio.h
-include/mariadb/ma_tls.h
-include/mariadb/mariadb/ma_io.h
-include/mariadb/mariadb_com.h
-include/mariadb/mariadb_ctype.h
-include/mariadb/mariadb_dyncol.h
-include/mariadb/mariadb_rpl.h
-include/mariadb/mariadb_stmt.h
-include/mariadb/mariadb_version.h
-include/mariadb/mysql.h
-include/mariadb/mysql/client_plugin.h
-include/mariadb/mysql/plugin_auth.h
-include/mariadb/mysql/plugin_auth_common.h
-include/mariadb/mysqld_error.h
-lib/mariadb/libmariadb.a
-lib/mariadb/libmariadb.so
-lib/mariadb/libmariadb.so.3
-lib/mariadb/libmariadbclient.a
-lib/mariadb/plugin/auth_gssapi_client.so
-lib/mariadb/plugin/caching_sha2_password.so
-lib/mariadb/plugin/client_ed25519.so
-lib/mariadb/plugin/dialog.so
-lib/mariadb/plugin/mysql_clear_password.so
-lib/mariadb/plugin/remote_io.so
-lib/mariadb/plugin/sha256_password.so
-lib/mariadb/plugin/zstd.so
-libdata/pkgconfig/libmariadb.pc
-share/man/man3/mariadb_cancel.3.gz
-share/man/man3/mariadb_connection.3.gz
-share/man/man3/mariadb_dyncol_check.3.gz
-share/man/man3/mariadb_dyncol_column_cmp_named.3.gz
-share/man/man3/mariadb_dyncol_column_count.3.gz
-share/man/man3/mariadb_dyncol_create_many_named.3.gz
-share/man/man3/mariadb_dyncol_create_many_num.3.gz
-share/man/man3/mariadb_dyncol_exists_named.3.gz
-share/man/man3/mariadb_dyncol_exists_num.3.gz
-share/man/man3/mariadb_dyncol_free.3.gz
-share/man/man3/mariadb_dyncol_list_named.3.gz
-share/man/man3/mariadb_dyncol_list_num.3.gz
-share/man/man3/mariadb_dyncol_unpack.3.gz
-share/man/man3/mariadb_dyncol_update_many_named.3.gz
-share/man/man3/mariadb_dyncol_update_many_num.3.gz
-share/man/man3/mariadb_get_infov.3.gz
-share/man/man3/mariadb_reconnect.3.gz
-share/man/man3/mariadb_rpl_close.3.gz
-share/man/man3/mariadb_rpl_fetch.3.gz
-share/man/man3/mariadb_rpl_get_optionsv.3.gz
-share/man/man3/mariadb_rpl_open.3.gz
-share/man/man3/mariadb_rpl_optionsv.3.gz
-share/man/man3/mariadb_stmt_execute_direct.3.gz
-share/man/man3/mariadb_stmt_fetch_fields.3.gz
-share/man/man3/mysql_affected_rows.3.gz
-share/man/man3/mysql_autocommit.3.gz
-share/man/man3/mysql_change_user.3.gz
-share/man/man3/mysql_close.3.gz
-share/man/man3/mysql_commit.3.gz
-share/man/man3/mysql_data_seek.3.gz
-share/man/man3/mysql_errno.3.gz
-share/man/man3/mysql_error.3.gz
-share/man/man3/mysql_fetch_field.3.gz
-share/man/man3/mysql_fetch_field_direct.3.gz
-share/man/man3/mysql_fetch_fields.3.gz
-share/man/man3/mysql_fetch_lengths.3.gz
-share/man/man3/mysql_fetch_row.3.gz
-share/man/man3/mysql_field_count.3.gz
-share/man/man3/mysql_field_seek.3.gz
-share/man/man3/mysql_field_tell.3.gz
-share/man/man3/mysql_free_result.3.gz
-share/man/man3/mysql_get_character_set_info.3.gz
-share/man/man3/mysql_get_client_info.3.gz
-share/man/man3/mysql_get_client_version.3.gz
-share/man/man3/mysql_get_host_info.3.gz
-share/man/man3/mysql_get_proto_info.3.gz
-share/man/man3/mysql_get_server_info.3.gz
-share/man/man3/mysql_get_server_version.3.gz
-share/man/man3/mysql_get_socket.3.gz
-share/man/man3/mysql_get_ssl_cipher.3.gz
-share/man/man3/mysql_hex_string.3.gz
-share/man/man3/mysql_info.3.gz
-share/man/man3/mysql_init.3.gz
-share/man/man3/mysql_kill.3.gz
-share/man/man3/mysql_more_results.3.gz
-share/man/man3/mysql_next_result.3.gz
-share/man/man3/mysql_num_fields.3.gz
-share/man/man3/mysql_num_rows.3.gz
-share/man/man3/mysql_options.3.gz
-share/man/man3/mysql_options4.3.gz
-share/man/man3/mysql_optionsv.3.gz
-share/man/man3/mysql_ping.3.gz
-share/man/man3/mysql_query.3.gz
-share/man/man3/mysql_read_query_result.3.gz
-share/man/man3/mysql_real_connect.3.gz
-share/man/man3/mysql_real_escape_string.3.gz
-share/man/man3/mysql_real_query.3.gz
-share/man/man3/mysql_refresh.3.gz
-share/man/man3/mysql_reset_connection.3.gz
-share/man/man3/mysql_rollback.3.gz
-share/man/man3/mysql_row_seek.3.gz
-share/man/man3/mysql_row_tell.3.gz
-share/man/man3/mysql_select_db.3.gz
-share/man/man3/mysql_send_query.3.gz
-share/man/man3/mysql_server_end.3.gz
-share/man/man3/mysql_server_init.3.gz
-share/man/man3/mysql_session_track_get_first.3.gz
-share/man/man3/mysql_session_track_get_next.3.gz
-share/man/man3/mysql_set_character_set.3.gz
-share/man/man3/mysql_set_server_option.3.gz
-share/man/man3/mysql_shutdown.3.gz
-share/man/man3/mysql_sqlstate.3.gz
-share/man/man3/mysql_ssl_set.3.gz
-share/man/man3/mysql_stat.3.gz
-share/man/man3/mysql_stmt_affected_rows.3.gz
-share/man/man3/mysql_stmt_attr_get.3.gz
-share/man/man3/mysql_stmt_attr_set.3.gz
-share/man/man3/mysql_stmt_bind_param.3.gz
-share/man/man3/mysql_stmt_bind_result.3.gz
-share/man/man3/mysql_stmt_close.3.gz
-share/man/man3/mysql_stmt_data_seek.3.gz
-share/man/man3/mysql_stmt_errno.3.gz
-share/man/man3/mysql_stmt_error.3.gz
-share/man/man3/mysql_stmt_execute.3.gz
-share/man/man3/mysql_stmt_fetch.3.gz
-share/man/man3/mysql_stmt_fetch_column.3.gz
-share/man/man3/mysql_stmt_field_count.3.gz
-share/man/man3/mysql_stmt_free_result.3.gz
-share/man/man3/mysql_stmt_init.3.gz
-share/man/man3/mysql_stmt_insert_id.3.gz
-share/man/man3/mysql_stmt_more_results.3.gz
-share/man/man3/mysql_stmt_next_result.3.gz
-share/man/man3/mysql_stmt_num_rows.3.gz
-share/man/man3/mysql_stmt_param_count.3.gz
-share/man/man3/mysql_stmt_param_metadata.3.gz
-share/man/man3/mysql_stmt_prepare.3.gz
-share/man/man3/mysql_stmt_reset.3.gz
-share/man/man3/mysql_stmt_result_metadata.3.gz
-share/man/man3/mysql_stmt_row_seek.3.gz
-share/man/man3/mysql_stmt_row_tell.3.gz
-share/man/man3/mysql_stmt_send_long_data.3.gz
-share/man/man3/mysql_stmt_sqlstate.3.gz
-share/man/man3/mysql_stmt_store_result.3.gz
-share/man/man3/mysql_stmt_warning_count.3.gz
-share/man/man3/mysql_store_result.3.gz
-share/man/man3/mysql_thread_end.3.gz
-share/man/man3/mysql_thread_id.3.gz
-share/man/man3/mysql_thread_init.3.gz
-share/man/man3/mysql_use_result.3.gz
-share/man/man3/mysql_warning_count.3.gz
diff --git a/databases/mariadb114-server/files/patch-storage_columnstore-tr1 b/databases/mariadb114-server/files/patch-storage_columnstore-tr1
deleted file mode 100644
index 863acf8fe0c5..000000000000
--- a/databases/mariadb114-server/files/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"