Skip to content

Commit 7489d0b

Browse files
LinuxJediLinuxJedi
committed
MCOL-3625 Rename packages
Rename packages to MariaDB-columnstore-engine, MariaDB-columnstore-libs and MariaDB-columnstore-platform. Also add the "columnstore-" prefix the the components so that MariaDB's packaging system understands then and add a line to include them in MariaDB's packaging. In addition * Fix S3 building for dist source build * Fix Debian 10 dependency issue * Fix git handling for dist builds * Add support for MariaDB's RPM building * Use MariaDB's PCRE and readline * Removes a few dead files * Fix Boost noncopyable includes
1 parent a8cd34f commit 7489d0b

File tree

87 files changed

+297
-340
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+297
-340
lines changed

‎CMakeLists.txt

+122-92
Large diffs are not rendered by default.

‎cmake/columnstore_version.cmake

+19-17
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
# Generate "something" to trigger cmake rerun when VERSION changes
44
CONFIGURE_FILE(
5-
${CMAKE_SOURCE_DIR}/VERSION
5+
${ENGINE_SRC_DIR}/VERSION
66
${CMAKE_BINARY_DIR}/VERSION.dep
77
)
88

99
# Read value for a variable from VERSION.
1010

1111
MACRO(COLUMNSTORE_GET_CONFIG_VALUE keyword var)
1212
IF(NOT ${var})
13-
FILE (STRINGS ${CMAKE_SOURCE_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
13+
FILE (STRINGS ${ENGINE_SRC_DIR}/VERSION str REGEX "^[ ]*${keyword}=")
1414
IF(str)
1515
STRING(REPLACE "${keyword}=" "" str ${str})
1616
STRING(REGEX REPLACE "[ ].*" "" str "${str}")
@@ -20,27 +20,29 @@ MACRO(COLUMNSTORE_GET_CONFIG_VALUE keyword var)
2020
ENDMACRO()
2121

2222
MACRO(GET_COLUMNSTORE_VERSION)
23-
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MAJOR" MAJOR_VERSION)
24-
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MINOR" MINOR_VERSION)
25-
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_PATCH" PATCH_VERSION)
26-
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_EXTRA" EXTRA_VERSION)
27-
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_RELEASE" RELEASE_VERSION)
23+
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MAJOR" CS_MAJOR_VERSION)
24+
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_MINOR" CS_MINOR_VERSION)
25+
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_PATCH" CS_PATCH_VERSION)
26+
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_EXTRA" CS_EXTRA_VERSION)
27+
COLUMNSTORE_GET_CONFIG_VALUE("COLUMNSTORE_VERSION_RELEASE" CS_RELEASE_VERSION)
2828

2929

30-
IF(NOT "${MAJOR_VERSION}" MATCHES "[0-9]+" OR
31-
NOT "${MINOR_VERSION}" MATCHES "[0-9]+" OR
32-
NOT "${PATCH_VERSION}" MATCHES "[0-9]+")
30+
IF(NOT "${CS_MAJOR_VERSION}" MATCHES "[0-9]+" OR
31+
NOT "${CS_MINOR_VERSION}" MATCHES "[0-9]+" OR
32+
NOT "${CS_PATCH_VERSION}" MATCHES "[0-9]+")
3333
MESSAGE(FATAL_ERROR "VERSION file cannot be parsed.")
3434
ENDIF()
3535

36-
SET(VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
36+
SET(VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}")
3737
MESSAGE(STATUS "MariaDB-Columnstore ${VERSION}")
38-
SET(CPACK_PACKAGE_VERSION_MAJOR ${MAJOR_VERSION})
39-
SET(CPACK_PACKAGE_VERSION_MINOR ${MINOR_VERSION})
40-
SET(CPACK_PACKAGE_VERSION_PATCH ${PATCH_VERSION}${EXTRA_VERSION})
41-
SET(PACKAGE_VERSION "${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}${EXTRA_VERSION}")
42-
SET(PACKAGE_RELEASE "${RELEASE_VERSION}")
38+
IF (NOT INSTALL_LAYOUT)
39+
SET(CPACK_PACKAGE_VERSION_MAJOR ${CS_MAJOR_VERSION})
40+
SET(CPACK_PACKAGE_VERSION_MINOR ${CS_MINOR_VERSION})
41+
SET(CPACK_PACKAGE_VERSION_PATCH ${CS_PATCH_VERSION}${CS_EXTRA_VERSION})
42+
ENDIF ()
43+
SET(PACKAGE_VERSION "${CS_MAJOR_VERSION}.${CS_MINOR_VERSION}.${CS_PATCH_VERSION}${CS_EXTRA_VERSION}")
44+
SET(PACKAGE_RELEASE "${CS_RELEASE_VERSION}")
4345
ENDMACRO()
4446

4547
# Get columnstore version
46-
GET_COLUMNSTORE_VERSION()
48+
GET_COLUMNSTORE_VERSION()

‎cmake/cpackEngineDEB.cmake

+9-9
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE})
1111
# Note that this variable is DEB not DEBIAN! http://public.kitware.com/pipermail/cmake/2014-July/058030.html
1212
SET(CPACK_DEB_COMPONENT_INSTALL ON)
1313

14-
SET(CPACK_COMPONENTS_ALL platform libs storage-engine)
14+
SET(CPACK_COMPONENTS_ALL columnstore-platform columnstore-libs columnstore-engine)
1515

16-
SET(CPACK_PACKAGE_NAME "mariadb-columnstore")
16+
SET(CPACK_PACKAGE_NAME "MariaDB")
1717
SET(ENGINE_ARCH "amd64")
1818

1919
IF (NOT CPACK_DEBIAN_PACKAGE_VERSION)
@@ -54,9 +54,9 @@ SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DESCRIPTION "MariaDB Columnstore connect
5454
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_SUMMARY "MariaDB ColumnStore: A Scale out Columnar storage engine for MariaDB")
5555

5656

57-
SET(CPACK_DEBIAN_LIBS_PACKAGE_PROVIDES "mariadb-columnstore-libs")
58-
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_PROVIDES "mariadb-columnstore-platform")
59-
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_PROVIDES "mariadb-columnstore-storage-engine")
57+
SET(CPACK_DEBIAN_LIBS_PACKAGE_PROVIDES "MariaDB-columnstore-libs")
58+
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_PROVIDES "MariaDB-columnstore-platform")
59+
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_PROVIDES "MariaDB-columnstore-engine")
6060

6161
set(DEBIAN_VERSION_NUMBER OFF)
6262
if (EXISTS "/etc/debian_version")
@@ -65,14 +65,14 @@ if (EXISTS "/etc/debian_version")
6565
set(DEBIAN_VERSION_NUMBER "${CMAKE_MATCH_1}")
6666
endif ()
6767
if ("${DEBIAN_VERSION_NUMBER}" EQUAL "8")
68-
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, mariadb-columnstore-libs, mariadb-columnstore-server, libsnappy1, libjemalloc1 net-tools")
68+
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, MariaDB-columnstore-libs, libsnappy1, libjemalloc1")
6969
elseif ("${DEBIAN_VERSION_NUMBER}" EQUAL "9")
70-
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, mariadb-columnstore-libs, mariadb-columnstore-server, libsnappy1v5, libreadline5, libjemalloc1 net-tools")
70+
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libreadline-dev, rsync, net-tools, libboost-all-dev, MariaDB-columnstore-libs, libsnappy1v5, libreadline5, libjemalloc1")
7171
else()
72-
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, libjemalloc1 net-tools")
72+
SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, perl, openssl, file, libdbi-perl, libboost-all-dev, libreadline-dev, rsync, libsnappy1v5, net-tools, libjemalloc1")
7373
endif ()
7474

75-
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DEPENDS "mariadb-columnstore-libs")
75+
SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DEPENDS "MariaDB-columnstore-libs")
7676

7777

7878
set( CPACK_DEBIAN_LIBS_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/libs/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/libs/prerm;" )

‎cmake/cpackEngineRPM.cmake

+9-9
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE})
88

99
SET(CPACK_RPM_COMPONENT_INSTALL ON)
1010

11-
SET(CPACK_COMPONENTS_ALL platform libs storage-engine)
11+
SET(CPACK_COMPONENTS_ALL columnstore-platform columnstore-libs columnstore-engine)
1212

13-
SET(CPACK_PACKAGE_NAME "mariadb-columnstore")
13+
SET(CPACK_PACKAGE_NAME "MariaDB")
1414
SET(ENGINE_ARCH "x86_64")
1515

1616
IF (NOT CPACK_RPM_PACKAGE_VERSION)
@@ -68,9 +68,9 @@ MACRO(SETA var)
6868
ENDFOREACH()
6969
ENDMACRO(SETA)
7070

71-
SETA(CPACK_RPM_libs_PACKAGE_PROVIDES "mariadb-columnstore-libs")
72-
SETA(CPACK_RPM_platform_PACKAGE_PROVIDES "mariadb-columnstore-platform")
73-
SETA(CPACK_RPM_storage-engine_PACKAGE_PROVIDES "mariadb-columnstore-storage-engine")
71+
SETA(CPACK_RPM_libs_PACKAGE_PROVIDES "MariaDB-columnstore-libs")
72+
SETA(CPACK_RPM_platform_PACKAGE_PROVIDES "MariaDB-columnstore-platform")
73+
SETA(CPACK_RPM_storage-engine_PACKAGE_PROVIDES "MariaDB-columnstore-engine")
7474

7575

7676
#boost is a source build in CentOS 6 so don't require it as a package
@@ -87,16 +87,16 @@ IF (EXISTS "/etc/SuSE-release")
8787
set(SUSE_VERSION_NUMBER "${CMAKE_MATCH_1}")
8888
ENDIF ()
8989
if (${REDHAT_VERSION_NUMBER} EQUAL 6)
90-
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "mariadb-columnstore-libs" "mariadb-columnstore-shared" "snappy" "net-tools")
90+
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "MariaDB-columnstore-libs" "MariaDB-columnstore-shared" "snappy" "net-tools")
9191
# Disable auto require as this will also try to pull Boost via RPM
9292
SET(CPACK_RPM_PACKAGE_AUTOREQPROV " no")
9393
elseif (${SUSE_VERSION_NUMBER} EQUAL 12)
94-
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "mariadb-columnstore-libs" "libsnappy1" "jemalloc" "net-tools")
94+
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost-devel >= 1.54.0" "MariaDB-columnstore-libs" "libsnappy1" "jemalloc" "net-tools")
9595
else ()
96-
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "mariadb-columnstore-libs" "snappy" "jemalloc" "net-tools")
96+
SETA(CPACK_RPM_platform_PACKAGE_REQUIRES "expect" "boost >= 1.53.0" "MariaDB-columnstore-libs" "snappy" "jemalloc" "net-tools")
9797
endif()
9898

99-
SETA(CPACK_RPM_storage-engine_PACKAGE_REQUIRES "mariadb-columnstore-libs")
99+
SETA(CPACK_RPM_storage-engine_PACKAGE_REQUIRES "MariaDB-columnstore-libs")
100100

101101
SET(CPACK_RPM_platform_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_platform.sh)
102102
SET(CPACK_RPM_libs_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/build/postInstall_libs.sh)

‎columnstoreversion.h.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef VERSIONNUMBER_H_
22
#define VERSIONNUMBER_H_
33
#include <string>
4-
const std::string columnstore_version("${VERSION}");
4+
const std::string columnstore_version("${PACKAGE_VERSION}");
55
const std::string columnstore_release("${PACKAGE_RELEASE}");
66
const std::string columnstore_commit_hash("${GIT_VERSION}");
77
#endif

‎dbcon/ddlpackage/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,5 @@ ADD_LIBRARY(ddlpackage SHARED
3535
${CMAKE_CURRENT_SOURCE_DIR}/ddl-scan.cpp
3636
)
3737

38-
SET_TARGET_PROPERTIES(ddlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
39-
40-
INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
38+
INSTALL(TARGETS ddlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
4139

‎dbcon/ddlpackageproc/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,5 @@ add_library(ddlpackageproc SHARED ${ddlpackageproc_LIB_SRCS})
1616

1717
target_link_libraries(ddlpackageproc ${NETSNMP_LIBRARIES})
1818

19-
set_target_properties(ddlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1)
20-
21-
install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
19+
install(TARGETS ddlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
2220

‎dbcon/dmlpackage/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,5 @@ ADD_LIBRARY(dmlpackage SHARED
3737
)
3838

3939

40-
SET_TARGET_PROPERTIES(dmlpackage PROPERTIES VERSION 1.0.0 SOVERSION 1)
41-
42-
INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
40+
INSTALL(TARGETS dmlpackage DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
4341

‎dbcon/dmlpackageproc/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ add_library(dmlpackageproc SHARED ${dmlpackageproc_LIB_SRCS})
1717

1818
target_link_libraries(dmlpackageproc ${NETSNMP_LIBRARIES})
1919

20-
set_target_properties(dmlpackageproc PROPERTIES VERSION 1.0.0 SOVERSION 1)
21-
22-
install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
20+
install(TARGETS dmlpackageproc DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
2321

2422

‎dbcon/execplan/CMakeLists.txt

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,5 @@ add_library(execplan SHARED ${execplan_LIB_SRCS})
4848

4949
target_link_libraries(execplan ${NETSNMP_LIBRARIES})
5050

51-
set_target_properties(execplan PROPERTIES VERSION 1.0.0 SOVERSION 1)
52-
53-
install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
51+
install(TARGETS execplan DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
5452

‎dbcon/joblist/CMakeLists.txt

+2-4
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,11 @@ set(joblist_LIB_SRCS
5959

6060
add_library(joblist SHARED ${joblist_LIB_SRCS})
6161

62-
set_target_properties(joblist PROPERTIES VERSION 1.0.0 SOVERSION 1)
63-
64-
install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
62+
install(TARGETS joblist DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
6563

6664
if (WITH_ORDERBY_UT)
6765
add_executable(job_orderby_tests orderby-tests.cpp)
6866
target_link_libraries(job_orderby_tests ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ${CPPUNIT_LIBRARIES} cppunit)
69-
install(TARGETS job_orderby_tests DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
67+
install(TARGETS job_orderby_tests DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
7068
endif()
7169

‎dbcon/joblist/expressionstep.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ void ExpressionStep::updateInputIndex(map<uint32_t, uint32_t>& indexMap, const J
509509
CalpontSystemCatalog::OID oid = sc->oid();
510510
CalpontSystemCatalog::OID dictOid = 0;
511511
CalpontSystemCatalog::ColType ct;
512-
uint32_t key = fColumnKeys[distance(fColumns.begin(), it)];
512+
uint32_t key = fColumnKeys[std::distance(fColumns.begin(), it)];
513513

514514
if (sc->schemaName().empty())
515515
{

‎dbcon/joblist/groupconcat.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ void GroupConcatInfo::mapColumns(const RowGroup& projRG)
263263
}
264264
else
265265
{
266-
idx = distance(keys.begin(), i3);
266+
idx = std::distance(keys.begin(), i3);
267267
}
268268

269269
(*k)->fOrderCond.push_back(make_pair(idx, i2->second));

‎dbcon/joblist/jlf_tuplejoblist.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -1007,12 +1007,12 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo)
10071007
unsigned itInc = 1; // iterator increase number
10081008
unsigned numOfStepsAddToBps = 0; // # steps to be added into TBPS
10091009

1010-
if ((distance(it, end) > 2 &&
1010+
if ((std::distance(it, end) > 2 &&
10111011
dynamic_cast<pDictionaryScan*>(it->get()) != NULL &&
10121012
(dynamic_cast<pColScanStep*>((it + 1)->get()) != NULL ||
10131013
dynamic_cast<pColStep*>((it + 1)->get()) != NULL) &&
10141014
dynamic_cast<TupleHashJoinStep*>((it + 2)->get()) != NULL) ||
1015-
(distance(it, end) > 1 &&
1015+
(std::distance(it, end) > 1 &&
10161016
dynamic_cast<pDictionaryScan*>(it->get()) != NULL &&
10171017
dynamic_cast<TupleHashJoinStep*>((it + 1)->get()) != NULL))
10181018
{
@@ -1053,7 +1053,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo)
10531053
itInc = 1;
10541054
numOfStepsAddToBps = 0;
10551055
}
1056-
else if (distance(begin, it) > 1 &&
1056+
else if (std::distance(begin, it) > 1 &&
10571057
(dynamic_cast<pDictionaryScan*>((it - 1)->get()) != NULL ||
10581058
dynamic_cast<pDictionaryScan*>((it - 2)->get()) != NULL) &&
10591059
dynamic_cast<TupleHashJoinStep*>(it->get()) != NULL)
@@ -1062,30 +1062,30 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo)
10621062
itInc = 1;
10631063
numOfStepsAddToBps = 0;
10641064
}
1065-
else if (distance(it, end) > 2 &&
1065+
else if (std::distance(it, end) > 2 &&
10661066
dynamic_cast<pColStep*>((it + 1)->get()) != NULL &&
10671067
dynamic_cast<FilterStep*>((it + 2)->get()) != NULL)
10681068
{
10691069
itInc = 3;
10701070
numOfStepsAddToBps = 3;
10711071
}
1072-
else if (distance(it, end) > 3 &&
1072+
else if (std::distance(it, end) > 3 &&
10731073
dynamic_cast<pColStep*>((it + 1)->get()) != NULL &&
10741074
dynamic_cast<pDictionaryStep*>((it + 2)->get()) != NULL &&
10751075
dynamic_cast<FilterStep*>((it + 3)->get()) != NULL)
10761076
{
10771077
itInc = 4;
10781078
numOfStepsAddToBps = 4;
10791079
}
1080-
else if (distance(it, end) > 3 &&
1080+
else if (std::distance(it, end) > 3 &&
10811081
dynamic_cast<pDictionaryStep*>((it + 1)->get()) != NULL &&
10821082
dynamic_cast<pColStep*>((it + 2)->get()) != NULL &&
10831083
dynamic_cast<FilterStep*>((it + 3)->get()) != NULL)
10841084
{
10851085
itInc = 4;
10861086
numOfStepsAddToBps = 4;
10871087
}
1088-
else if (distance(it, end) > 4 &&
1088+
else if (std::distance(it, end) > 4 &&
10891089
dynamic_cast<pDictionaryStep*>((it + 1)->get()) != NULL &&
10901090
dynamic_cast<pColStep*>((it + 2)->get()) != NULL &&
10911091
dynamic_cast<pDictionaryStep*>((it + 3)->get()) != NULL &&
@@ -1094,7 +1094,7 @@ bool combineJobStepsByTable(TableInfoMap::iterator& mit, JobInfo& jobInfo)
10941094
itInc = 5;
10951095
numOfStepsAddToBps = 5;
10961096
}
1097-
else if (distance(it, end) > 1 &&
1097+
else if (std::distance(it, end) > 1 &&
10981098
(dynamic_cast<pColStep*>(it->get()) != NULL ||
10991099
dynamic_cast<pColScanStep*>(it->get()) != NULL) &&
11001100
dynamic_cast<pDictionaryStep*>((it + 1)->get()) != NULL)
@@ -2060,7 +2060,7 @@ uint32_t getKeyIndex(uint32_t key, const RowGroup& rg)
20602060
if (i == rg.getKeys().end())
20612061
throw runtime_error("No key found.");
20622062

2063-
return distance(rg.getKeys().begin(), i);
2063+
return std::distance(rg.getKeys().begin(), i);
20642064
}
20652065

20662066

‎dbcon/joblist/joblistfactory.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -1110,11 +1110,11 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo
11101110
else
11111111
it = pcv.insert(pcv.end(), srcp);
11121112

1113-
projectKeys.insert(projectKeys.begin() + distance(pcv.begin(), it), tupleKey);
1113+
projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey);
11141114
}
11151115
else if (doDistinct) // @bug4250, move forward distinct column if necessary.
11161116
{
1117-
uint32_t pos = distance(projectKeys.begin(), keyIt);
1117+
uint32_t pos = std::distance(projectKeys.begin(), keyIt);
11181118

11191119
if (pos >= lastGroupByPos)
11201120
{
@@ -1263,11 +1263,11 @@ const JobStepVector doAggProject(const CalpontSelectExecutionPlan* csep, JobInfo
12631263
else
12641264
it = pcv.insert(pcv.end(), srcp);
12651265

1266-
projectKeys.insert(projectKeys.begin() + distance(pcv.begin(), it), tupleKey);
1266+
projectKeys.insert(projectKeys.begin() + std::distance(pcv.begin(), it), tupleKey);
12671267
}
12681268
else if (doDistinct) // @bug4250, move forward distinct column if necessary.
12691269
{
1270-
uint32_t pos = distance(projectKeys.begin(), keyIt);
1270+
uint32_t pos = std::distance(projectKeys.begin(), keyIt);
12711271

12721272
if (pos >= lastGroupByPos)
12731273
{
@@ -1392,7 +1392,7 @@ void changePcolStepToPcolScan(JobStepVector::iterator& it, JobStepVector::iterat
13921392
{
13931393
//If we have a pDictionaryScan-pColStep duo, then change the pColStep
13941394
if (typeid(*(it->get())) == typeid(pDictionaryScan) &&
1395-
distance(it, end) > 1 &&
1395+
std::distance(it, end) > 1 &&
13961396
typeid(*((it + 1)->get())) == typeid(pColStep))
13971397
{
13981398
++it;

‎dbcon/joblist/windowfunctionstep.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1647,8 +1647,8 @@ void WindowFunctionStep::sort(std::vector<RowPosition>::iterator v, uint64_t n)
16471647
}
16481648
}
16491649

1650-
sort(v, distance(v, h) + 1);
1651-
sort(l, distance(l, v) + n);
1650+
sort(v, std::distance(v, h) + 1);
1651+
sort(l, std::distance(l, v) + n);
16521652
}
16531653

16541654

0 commit comments

Comments
 (0)