diff options
Diffstat (limited to 'storage/columnstore')
324 files changed, 140 insertions, 475 deletions
diff --git a/storage/columnstore/CMakeLists.txt b/storage/columnstore/CMakeLists.txt index ebb138c7..3767d5da 100644 --- a/storage/columnstore/CMakeLists.txt +++ b/storage/columnstore/CMakeLists.txt @@ -1,6 +1,7 @@ #set(PLUGIN_COLUMNSTORE "NO" CACHE STRING "Enable ColumnStore engine") -if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}") +if("NO" STREQUAL "${PLUGIN_COLUMNSTORE}" OR + (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/columnstore/CMakeLists.txt)) return() endif() diff --git a/storage/columnstore/columnstore/CMakeLists.txt b/storage/columnstore/columnstore/CMakeLists.txt index 5d43aef5..0e6ad413 100644 --- a/storage/columnstore/columnstore/CMakeLists.txt +++ b/storage/columnstore/columnstore/CMakeLists.txt @@ -223,6 +223,7 @@ IF (MASK_LONGDOUBLE) MY_CHECK_AND_SET_COMPILER_FLAG("-DMASK_LONGDOUBLE") ENDIF() + SET (CMAKE_REQUIRED_FLAGS "-Werror -Wall") SET (ENGINE_LDFLAGS "-Wl,--no-as-needed -Wl,--add-needed") SET (ENGINE_DT_LIB datatypes) diff --git a/storage/columnstore/columnstore/VERSION b/storage/columnstore/columnstore/VERSION index 35b4ad7f..fb113a00 100644 --- a/storage/columnstore/columnstore/VERSION +++ b/storage/columnstore/columnstore/VERSION @@ -1,4 +1,4 @@ COLUMNSTORE_VERSION_MAJOR=6 COLUMNSTORE_VERSION_MINOR=4 COLUMNSTORE_VERSION_PATCH=8 -COLUMNSTORE_VERSION_RELEASE=1 +COLUMNSTORE_VERSION_RELEASE=2 diff --git a/storage/columnstore/columnstore/datatypes/mcs_datatype.cpp b/storage/columnstore/columnstore/datatypes/mcs_datatype.cpp index 59bc2bf2..2ca95ba2 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_datatype.cpp +++ b/storage/columnstore/columnstore/datatypes/mcs_datatype.cpp @@ -1915,4 +1915,3 @@ const uint8_t* TypeHandlerUDecimal128::getEmptyValueForType( } // end of namespace datatypes -// vim:ts=2 sw=2: diff --git a/storage/columnstore/columnstore/datatypes/mcs_datatype.h b/storage/columnstore/columnstore/datatypes/mcs_datatype.h index a25c23e1..11b0d989 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_datatype.h +++ b/storage/columnstore/columnstore/datatypes/mcs_datatype.h @@ -2522,6 +2522,4 @@ class TypeHandlerTimestamp : public TypeHandlerTemporal } // end of namespace datatypes -#endif // MCS_DATATYPE_H_INCLUDED - -// vim:ts=2 sw=2: +#endif // MCS_DATATYPE_H_INCLUDED
\ No newline at end of file diff --git a/storage/columnstore/columnstore/datatypes/mcs_datatype_basic.h b/storage/columnstore/columnstore/datatypes/mcs_datatype_basic.h index 5ba6cfc1..16179f71 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_datatype_basic.h +++ b/storage/columnstore/columnstore/datatypes/mcs_datatype_basic.h @@ -80,4 +80,3 @@ uint64_t xFloatToMCSUInt64Round(SRC value) } // end of namespace datatypes #endif // MCS_DATATYPE_BASIC_H_INCLUDED -// vim:ts=2 sw=2: diff --git a/storage/columnstore/columnstore/datatypes/mcs_double.h b/storage/columnstore/columnstore/datatypes/mcs_double.h index e34bf7aa..7e420f2f 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_double.h +++ b/storage/columnstore/columnstore/datatypes/mcs_double.h @@ -55,5 +55,4 @@ class TDouble } // end of namespace datatypes -#endif // MCS_DOUBLE_H_INCLUDED -// vim:ts=2 sw=2: +#endif // MCS_DOUBLE_H_INCLUDED
\ No newline at end of file diff --git a/storage/columnstore/columnstore/datatypes/mcs_float128.h b/storage/columnstore/columnstore/datatypes/mcs_float128.h index 058ad1ed..c25cfc90 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_float128.h +++ b/storage/columnstore/columnstore/datatypes/mcs_float128.h @@ -725,5 +725,4 @@ class TFloat128 } // namespace datatypes -#endif // MCS_TSFLOAT128_H_INCLUDED -// vim:ts=2 sw=2: +#endif // MCS_TSFLOAT128_H_INCLUDED
\ No newline at end of file diff --git a/storage/columnstore/columnstore/datatypes/mcs_int128.cpp b/storage/columnstore/columnstore/datatypes/mcs_int128.cpp index 13329fc4..58dee474 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_int128.cpp +++ b/storage/columnstore/columnstore/datatypes/mcs_int128.cpp @@ -113,4 +113,3 @@ std::ostream& operator<<(std::ostream& os, const TSInt128& x) } } // end of namespace datatypes -// vim:ts=2 sw=2: diff --git a/storage/columnstore/columnstore/datatypes/mcs_int128.h b/storage/columnstore/columnstore/datatypes/mcs_int128.h index 02df0c7e..ddc37bdf 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_int128.h +++ b/storage/columnstore/columnstore/datatypes/mcs_int128.h @@ -324,4 +324,3 @@ class TSInt128 } // end of namespace datatypes #endif // MCS_TSINT128_H_INCLUDED -// vim:ts=2 sw=2: diff --git a/storage/columnstore/columnstore/datatypes/mcs_int64.h b/storage/columnstore/columnstore/datatypes/mcs_int64.h index c44f1169..be379a62 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_int64.h +++ b/storage/columnstore/columnstore/datatypes/mcs_int64.h @@ -180,5 +180,4 @@ class TSInt64Null : public TSInt64, public TNullFlag } // end of namespace datatypes -#endif // MCS_INT64_H_INCLUDED -// vim:ts=2 sw=2: +#endif // MCS_INT64_H_INCLUDED
\ No newline at end of file diff --git a/storage/columnstore/columnstore/datatypes/mcs_longdouble.h b/storage/columnstore/columnstore/datatypes/mcs_longdouble.h index 55215642..f33d7658 100644 --- a/storage/columnstore/columnstore/datatypes/mcs_longdouble.h +++ b/storage/columnstore/columnstore/datatypes/mcs_longdouble.h @@ -55,5 +55,4 @@ class TLongDouble } // end of namespace datatypes -#endif // MCS_LONGDOUBLE_H_INCLUDED -// vim:ts=2 sw=2: +#endif // MCS_LONGDOUBLE_H_INCLUDED
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/ddlpackage/CMakeLists.txt b/storage/columnstore/columnstore/dbcon/ddlpackage/CMakeLists.txt index ed211403..5557ed3f 100644 --- a/storage/columnstore/columnstore/dbcon/ddlpackage/CMakeLists.txt +++ b/storage/columnstore/columnstore/dbcon/ddlpackage/CMakeLists.txt @@ -9,7 +9,7 @@ FIND_PACKAGE(FLEX REQUIRED) FLEX_TARGET(ddl_scan ddl.l ${CMAKE_CURRENT_BINARY_DIR}/ddl-scan.cpp COMPILE_FLAGS "-i -L -Pddl") ADD_FLEX_BISON_DEPENDENCY(ddl_scan ddl_gram) -set_source_files_properties(ddl-scan.cpp PROPERTIES COMPILE_FLAGS -Wno-sign-compare) +set_source_files_properties(ddl-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT") ########### next target ############### diff --git a/storage/columnstore/columnstore/dbcon/ddlpackageproc/altertableprocessor.cpp b/storage/columnstore/columnstore/dbcon/ddlpackageproc/altertableprocessor.cpp index aca76bf4..c09c79b4 100644 --- a/storage/columnstore/columnstore/dbcon/ddlpackageproc/altertableprocessor.cpp +++ b/storage/columnstore/columnstore/dbcon/ddlpackageproc/altertableprocessor.cpp @@ -2539,7 +2539,6 @@ void AlterTableProcessor::renameColumn(uint32_t sessionID, execplan::CalpontSyst } } // namespace ddlpackageprocessor -// vim:ts=4 sw=4: #ifdef __clang__ #pragma clang diagnostic pop diff --git a/storage/columnstore/columnstore/dbcon/ddlpackageproc/createtableprocessor.cpp b/storage/columnstore/columnstore/dbcon/ddlpackageproc/createtableprocessor.cpp index f51d0395..f0ff32be 100644 --- a/storage/columnstore/columnstore/dbcon/ddlpackageproc/createtableprocessor.cpp +++ b/storage/columnstore/columnstore/dbcon/ddlpackageproc/createtableprocessor.cpp @@ -830,4 +830,3 @@ void CreateTableProcessor::rollBackCreateTable(const string& error, BRM::TxnID t } } // namespace ddlpackageprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/ddlpackageproc/ddlpackageprocessor.cpp b/storage/columnstore/columnstore/dbcon/ddlpackageproc/ddlpackageprocessor.cpp index 3740035d..bf27af32 100644 --- a/storage/columnstore/columnstore/dbcon/ddlpackageproc/ddlpackageprocessor.cpp +++ b/storage/columnstore/columnstore/dbcon/ddlpackageproc/ddlpackageprocessor.cpp @@ -1491,4 +1491,3 @@ int DDLPackageProcessor::commitTransaction(uint64_t uniqueId, BRM::TxnID txnID) } } // namespace ddlpackageprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/ddlpackageproc/ddlpackageprocessor.h b/storage/columnstore/columnstore/dbcon/ddlpackageproc/ddlpackageprocessor.h index d2dd84c7..c2458528 100644 --- a/storage/columnstore/columnstore/dbcon/ddlpackageproc/ddlpackageprocessor.h +++ b/storage/columnstore/columnstore/dbcon/ddlpackageproc/ddlpackageprocessor.h @@ -54,7 +54,7 @@ #define EXPORT #endif -//#define IDB_DDL_DEBUG +// #define IDB_DDL_DEBUG namespace ddlpackageprocessor { #define SUMMARY_INFO(message) \ @@ -891,5 +891,4 @@ bool from_string(T& t, const std::string& s, std::ios_base& (*f)(std::ios_base&) #undef EXPORT -#endif // DDLPACKAGEPROCESSOR_H -// vim:ts=4 sw=4: +#endif // DDLPACKAGEPROCESSOR_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/ddlpackageproc/droptableprocessor.cpp b/storage/columnstore/columnstore/dbcon/ddlpackageproc/droptableprocessor.cpp index e1ca785d..4cfc7946 100644 --- a/storage/columnstore/columnstore/dbcon/ddlpackageproc/droptableprocessor.cpp +++ b/storage/columnstore/columnstore/dbcon/ddlpackageproc/droptableprocessor.cpp @@ -1367,4 +1367,3 @@ TruncTableProcessor::DDLResult TruncTableProcessor::processPackage( } // namespace ddlpackageprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/dmlpackage/CMakeLists.txt b/storage/columnstore/columnstore/dbcon/dmlpackage/CMakeLists.txt index d7b5f235..e999cdae 100644 --- a/storage/columnstore/columnstore/dbcon/dmlpackage/CMakeLists.txt +++ b/storage/columnstore/columnstore/dbcon/dmlpackage/CMakeLists.txt @@ -10,7 +10,7 @@ FIND_PACKAGE(FLEX REQUIRED) FLEX_TARGET(dml_scan dml.l ${CMAKE_CURRENT_BINARY_DIR}/dml-scan.cpp COMPILE_FLAGS "-i -L -Pdml") ADD_FLEX_BISON_DEPENDENCY(dml_scan dml_gram) -set_source_files_properties(dml-scan.cpp PROPERTIES COMPILE_FLAGS -Wno-sign-compare) +set_source_files_properties(dml-scan.cpp PROPERTIES COMPILE_FLAGS "-Wno-register -Wno-deprecated-register -Wno-sign-compare -DYY_NO_INPUT") ########### next target ############### diff --git a/storage/columnstore/columnstore/dbcon/dmlpackageproc/autoincrementdata.cpp b/storage/columnstore/columnstore/dbcon/dmlpackageproc/autoincrementdata.cpp index 3a71efaf..875e90d7 100644 --- a/storage/columnstore/columnstore/dbcon/dmlpackageproc/autoincrementdata.cpp +++ b/storage/columnstore/columnstore/dbcon/dmlpackageproc/autoincrementdata.cpp @@ -97,4 +97,3 @@ AutoincrementData::OIDNextValue& AutoincrementData::getOidNextValueMap() return fOidNextValueMap; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/dmlpackageproc/autoincrementdata.h b/storage/columnstore/columnstore/dbcon/dmlpackageproc/autoincrementdata.h index 17be0648..81614f40 100644 --- a/storage/columnstore/columnstore/dbcon/dmlpackageproc/autoincrementdata.h +++ b/storage/columnstore/columnstore/dbcon/dmlpackageproc/autoincrementdata.h @@ -50,5 +50,4 @@ class AutoincrementData boost::mutex fOIDnextvalLock; }; -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/dmlpackageproc/dmlpackageprocessor.cpp b/storage/columnstore/columnstore/dbcon/dmlpackageproc/dmlpackageprocessor.cpp index b5217b0e..78b19b39 100644 --- a/storage/columnstore/columnstore/dbcon/dmlpackageproc/dmlpackageprocessor.cpp +++ b/storage/columnstore/columnstore/dbcon/dmlpackageproc/dmlpackageprocessor.cpp @@ -913,4 +913,3 @@ int DMLPackageProcessor::endTransaction(uint64_t uniqueId, BRM::TxnID txnID, boo return rc; } } // namespace dmlpackageprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/dmlpackageproc/insertpackageprocessor.cpp b/storage/columnstore/columnstore/dbcon/dmlpackageproc/insertpackageprocessor.cpp index fb844b69..3fd6b7ae 100644 --- a/storage/columnstore/columnstore/dbcon/dmlpackageproc/insertpackageprocessor.cpp +++ b/storage/columnstore/columnstore/dbcon/dmlpackageproc/insertpackageprocessor.cpp @@ -432,4 +432,3 @@ DMLPackageProcessor::DMLResult InsertPackageProcessor::processPackage(dmlpackage } // namespace dmlpackageprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/dmlpackageproc/tablelockdata.cpp b/storage/columnstore/columnstore/dbcon/dmlpackageproc/tablelockdata.cpp index d5f94ec6..1c169917 100644 --- a/storage/columnstore/columnstore/dbcon/dmlpackageproc/tablelockdata.cpp +++ b/storage/columnstore/columnstore/dbcon/dmlpackageproc/tablelockdata.cpp @@ -101,4 +101,3 @@ TablelockData::OIDTablelock& TablelockData::getOidTablelockMap() } } // namespace dmlpackageprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/dmlpackageproc/tablelockdata.h b/storage/columnstore/columnstore/dbcon/dmlpackageproc/tablelockdata.h index a5910d84..9c52d1cf 100644 --- a/storage/columnstore/columnstore/dbcon/dmlpackageproc/tablelockdata.h +++ b/storage/columnstore/columnstore/dbcon/dmlpackageproc/tablelockdata.h @@ -62,5 +62,4 @@ class TablelockData #undef EXPORT -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/execplan/calpontselectexecutionplan.h b/storage/columnstore/columnstore/dbcon/execplan/calpontselectexecutionplan.h index 10217d36..04b83689 100644 --- a/storage/columnstore/columnstore/dbcon/execplan/calpontselectexecutionplan.h +++ b/storage/columnstore/columnstore/dbcon/execplan/calpontselectexecutionplan.h @@ -940,5 +940,4 @@ inline std::ostream& operator<<(std::ostream& os, const CalpontSelectExecutionPl } } // namespace execplan -#endif // CALPONTSELECTEXECUTIONPLAN_H -// vim:ts=4 sw=4: +#endif // CALPONTSELECTEXECUTIONPLAN_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/execplan/calpontsystemcatalog.h b/storage/columnstore/columnstore/dbcon/execplan/calpontsystemcatalog.h index 5be4b023..56322f3d 100644 --- a/storage/columnstore/columnstore/dbcon/execplan/calpontsystemcatalog.h +++ b/storage/columnstore/columnstore/dbcon/execplan/calpontsystemcatalog.h @@ -1284,5 +1284,4 @@ bool ctListSort(const CalpontSystemCatalog::ColType& a, const CalpontSystemCatal } // namespace execplan -#endif // EXECPLAN_CALPONTSYSTEMCATALOG_H -// vim:ts=4 sw=4: +#endif // EXECPLAN_CALPONTSYSTEMCATALOG_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/execplan/clientrotator.cpp b/storage/columnstore/columnstore/dbcon/execplan/clientrotator.cpp index 7616f90e..395d7648 100644 --- a/storage/columnstore/columnstore/dbcon/execplan/clientrotator.cpp +++ b/storage/columnstore/columnstore/dbcon/execplan/clientrotator.cpp @@ -399,4 +399,3 @@ void ClientRotator::writeToLog(int line, const string& msg, bool critical) const } } // namespace execplan -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/execplan/clientrotator.h b/storage/columnstore/columnstore/dbcon/execplan/clientrotator.h index f0be4ff7..3ce8e97e 100644 --- a/storage/columnstore/columnstore/dbcon/execplan/clientrotator.h +++ b/storage/columnstore/columnstore/dbcon/execplan/clientrotator.h @@ -167,5 +167,4 @@ class ClientRotator }; } // namespace execplan -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/execplan/constantcolumn.cpp b/storage/columnstore/columnstore/dbcon/execplan/constantcolumn.cpp index a3094285..bcdc6767 100644 --- a/storage/columnstore/columnstore/dbcon/execplan/constantcolumn.cpp +++ b/storage/columnstore/columnstore/dbcon/execplan/constantcolumn.cpp @@ -347,4 +347,3 @@ bool ConstantColumn::operator!=(const TreeNode* t) const } } // namespace execplan -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/execplan/constantfilter.cpp b/storage/columnstore/columnstore/dbcon/execplan/constantfilter.cpp index 4f837d0a..18f872e0 100644 --- a/storage/columnstore/columnstore/dbcon/execplan/constantfilter.cpp +++ b/storage/columnstore/columnstore/dbcon/execplan/constantfilter.cpp @@ -308,4 +308,3 @@ void ConstantFilter::setSimpleColumnList() } } // namespace execplan -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/execplan/sessionmanager.h b/storage/columnstore/columnstore/dbcon/execplan/sessionmanager.h index 71076c26..9014a703 100644 --- a/storage/columnstore/columnstore/dbcon/execplan/sessionmanager.h +++ b/storage/columnstore/columnstore/dbcon/execplan/sessionmanager.h @@ -69,7 +69,7 @@ namespace execplan * immediately, causing all subsequent references to fail. This only affects * 'leakcheck'. */ -//#define DESTROYSHMSEG +// #define DESTROYSHMSEG class SessionManager { @@ -214,5 +214,4 @@ class SessionManager } // namespace execplan -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/anydatalist.cpp b/storage/columnstore/columnstore/dbcon/joblist/anydatalist.cpp index 4e5df471..da1ae05a 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/anydatalist.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/anydatalist.cpp @@ -170,4 +170,3 @@ std::ostream& omitOidInDL(std::ostream& strm) } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/batchprimitiveprocessor-jl.h b/storage/columnstore/columnstore/dbcon/joblist/batchprimitiveprocessor-jl.h index 46c8a583..577a16d3 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/batchprimitiveprocessor-jl.h +++ b/storage/columnstore/columnstore/dbcon/joblist/batchprimitiveprocessor-jl.h @@ -44,7 +44,7 @@ #include "brm.h" #include "command-jl.h" #include "resourcemanager.h" -//#include "tableband.h" +// #include "tableband.h" namespace joblist { @@ -367,5 +367,4 @@ class BatchPrimitiveProcessorJL } // namespace joblist -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/columncommand-jl.h b/storage/columnstore/columnstore/dbcon/joblist/columncommand-jl.h index e0001902..2ac982cc 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/columncommand-jl.h +++ b/storage/columnstore/columnstore/dbcon/joblist/columncommand-jl.h @@ -130,5 +130,4 @@ class ColumnCommandJL : public CommandJL } // namespace joblist -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/crossenginestep.cpp b/storage/columnstore/columnstore/dbcon/joblist/crossenginestep.cpp index e0475c11..d03f21e0 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/crossenginestep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/crossenginestep.cpp @@ -828,4 +828,3 @@ void CrossEngineStep::formatMiniStats() } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/crossenginestep.h b/storage/columnstore/columnstore/dbcon/joblist/crossenginestep.h index 71c7386f..23f3315c 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/crossenginestep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/crossenginestep.h @@ -250,6 +250,4 @@ class CrossEngineStep : public BatchPrimitive, public TupleDeliveryStep } // namespace joblist -#endif // JOBLIST_CROSSENGINESTEP_H - -// vim:ts=4 sw=4: +#endif // JOBLIST_CROSSENGINESTEP_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/diskjoinstep.cpp b/storage/columnstore/columnstore/dbcon/joblist/diskjoinstep.cpp index 87be2166..2f69f962 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/diskjoinstep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/diskjoinstep.cpp @@ -163,7 +163,7 @@ void DiskJoinStep::smallReader() RGData rgData; bool more = true; int64_t memUsage = 0, combinedMemUsage = 0; - int rowCount = 0; + [[maybe_unused]] int rowCount = 0; RowGroup l_smallRG = smallRG; try @@ -224,7 +224,7 @@ void DiskJoinStep::largeReader() RGData rgData; bool more = true; int64_t largeSize = 0; - int rowCount = 0; + [[maybe_unused]] int rowCount = 0; RowGroup l_largeRG = largeRG; largeIterationCount++; diff --git a/storage/columnstore/columnstore/dbcon/joblist/distributedenginecomm.cpp b/storage/columnstore/columnstore/dbcon/joblist/distributedenginecomm.cpp index ced9bf81..4e735e58 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/distributedenginecomm.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/distributedenginecomm.cpp @@ -1150,4 +1150,3 @@ uint32_t DistributedEngineComm::MQE::getNextConnectionId(const size_t pmIndex, } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/elementtype.h b/storage/columnstore/columnstore/dbcon/joblist/elementtype.h index 0d1f6ed7..0b38d93e 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/elementtype.h +++ b/storage/columnstore/columnstore/dbcon/joblist/elementtype.h @@ -245,14 +245,14 @@ extern std::ostream& operator<<(std::ostream& out, const TupleType& rhs); #ifndef NO_DATALISTS -//#include "bandeddl.h" -//#include "wsdl.h" +// #include "bandeddl.h" +// #include "wsdl.h" #include "fifo.h" -//#include "bucketdl.h" -//#include "constantdatalist.h" -//#include "swsdl.h" -//#include "zdl.h" -//#include "deliverywsdl.h" +// #include "bucketdl.h" +// #include "constantdatalist.h" +// #include "swsdl.h" +// #include "zdl.h" +// #include "deliverywsdl.h" namespace joblist { @@ -639,5 +639,4 @@ extern std::ostream& omitOidInDL(std::ostream& strm); #endif -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/errorinfo.h b/storage/columnstore/columnstore/dbcon/joblist/errorinfo.h index 710cb89c..a709a938 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/errorinfo.h +++ b/storage/columnstore/columnstore/dbcon/joblist/errorinfo.h @@ -53,5 +53,4 @@ typedef boost::shared_ptr<ErrorInfo> SErrorInfo; } // namespace joblist -#endif // JOBLIST_ERROR_INFO_H_ -// vim:ts=4 sw=4: +#endif // JOBLIST_ERROR_INFO_H_
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/expressionstep.cpp b/storage/columnstore/columnstore/dbcon/joblist/expressionstep.cpp index 2f5b96af..b182c7b2 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/expressionstep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/expressionstep.cpp @@ -790,4 +790,3 @@ const string ExpressionStep::toString() const } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/fifo.h b/storage/columnstore/columnstore/dbcon/joblist/fifo.h index 62bf8935..025e9f63 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/fifo.h +++ b/storage/columnstore/columnstore/dbcon/joblist/fifo.h @@ -530,5 +530,4 @@ void FIFO<element_t>::totalFileCounts(uint64_t& numFiles, uint64_t& numBytes) co } // namespace joblist -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/groupconcat.cpp b/storage/columnstore/columnstore/dbcon/joblist/groupconcat.cpp index 5eb0e1b1..f9a64645 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/groupconcat.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/groupconcat.cpp @@ -1050,4 +1050,3 @@ const string GroupConcatNoOrder::toString() const } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/jlf_common.cpp b/storage/columnstore/columnstore/dbcon/joblist/jlf_common.cpp index 6ae8724e..47a1ecc6 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/jlf_common.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/jlf_common.cpp @@ -822,4 +822,3 @@ bool compatibleColumnTypes(const CalpontSystemCatalog::ColDataType& dt1, uint32_ } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/jlf_execplantojoblist.cpp b/storage/columnstore/columnstore/dbcon/joblist/jlf_execplantojoblist.cpp index 4ba29aa5..441ee1ea 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/jlf_execplantojoblist.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/jlf_execplantojoblist.cpp @@ -3446,7 +3446,6 @@ void JLF_ExecPlanToJobList::addJobSteps(JobStepVector& nsv, JobInfo& jobInfo, bo } } // namespace joblist -// vim:ts=4 sw=4: #ifdef __clang__ #pragma clang diagnostic pop diff --git a/storage/columnstore/columnstore/dbcon/joblist/jlf_graphics.cpp b/storage/columnstore/columnstore/dbcon/joblist/jlf_graphics.cpp index 7365e1c4..348fb85d 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/jlf_graphics.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/jlf_graphics.cpp @@ -418,7 +418,6 @@ ostream& writeDotCmds(ostream& dotFile, const JobStepVector& query, const JobSte } // end namespace jlf_graphics -// vim:ts=4 sw=4 syntax=cpp: #ifdef __clang__ #pragma clang diagnostic pop diff --git a/storage/columnstore/columnstore/dbcon/joblist/jlf_subquery.cpp b/storage/columnstore/columnstore/dbcon/joblist/jlf_subquery.cpp index 91d8a5de..0ea66ac0 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/jlf_subquery.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/jlf_subquery.cpp @@ -875,4 +875,3 @@ SJSTEP doUnionSub(CalpontExecutionPlan* ep, JobInfo& jobInfo) } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/jlf_tuplejoblist.cpp b/storage/columnstore/columnstore/dbcon/joblist/jlf_tuplejoblist.cpp index 7678d278..d388ce9f 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/jlf_tuplejoblist.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/jlf_tuplejoblist.cpp @@ -4559,7 +4559,6 @@ SJSTEP unionQueries(JobStepVector& queries, uint64_t distinctUnionNum, JobInfo& } } // namespace joblist -// vim:ts=4 sw=4: #ifdef __clang__ #pragma clang diagnostic pop diff --git a/storage/columnstore/columnstore/dbcon/joblist/joblist.cpp b/storage/columnstore/columnstore/dbcon/joblist/joblist.cpp index fd58bde0..7adc6a98 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/joblist.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/joblist.cpp @@ -1233,4 +1233,3 @@ void TupleJobList::abort() #pragma clang diagnostic pop #endif -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/joblist.h b/storage/columnstore/columnstore/dbcon/joblist/joblist.h index 61f498a2..4c6eb19e 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/joblist.h +++ b/storage/columnstore/columnstore/dbcon/joblist/joblist.h @@ -261,5 +261,4 @@ typedef boost::shared_ptr<TupleJobList> STJLP; #undef EXPORT -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/joblistfactory.cpp b/storage/columnstore/columnstore/dbcon/joblist/joblistfactory.cpp index 648b6f1c..26809d39 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/joblistfactory.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/joblistfactory.cpp @@ -2314,7 +2314,6 @@ SJLP JobListFactory::makeJobList(CalpontExecutionPlan* cplan, ResourceManager* r } } // namespace joblist -// vim:ts=4 sw=4: #ifdef __clang__ #pragma clang diagnostic pop diff --git a/storage/columnstore/columnstore/dbcon/joblist/jobstep.cpp b/storage/columnstore/columnstore/dbcon/joblist/jobstep.cpp index 36d13f35..8f42dff1 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/jobstep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/jobstep.cpp @@ -244,4 +244,3 @@ void JobStep::handleException(std::exception_ptr e, const int errorCode, const u } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/jobstep.h b/storage/columnstore/columnstore/dbcon/joblist/jobstep.h index e3c669cf..47371eb1 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/jobstep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/jobstep.h @@ -567,5 +567,4 @@ typedef boost::shared_ptr<JobStep> SJSTEP; } // namespace joblist -#endif // JOBLIST_JOBSTEP_H_ -// vim:ts=4 sw=4: +#endif // JOBLIST_JOBSTEP_H_
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/lbidlist.cpp b/storage/columnstore/columnstore/dbcon/joblist/lbidlist.cpp index 26080f0c..e784eb26 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/lbidlist.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/lbidlist.cpp @@ -920,4 +920,3 @@ template bool LBIDList::checkRangeOverlap<int64_t>(int64_t min, int64_t max, int } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/limitedorderby.cpp b/storage/columnstore/columnstore/dbcon/joblist/limitedorderby.cpp index 3aee6fc0..f4e573bd 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/limitedorderby.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/limitedorderby.cpp @@ -303,4 +303,3 @@ const string LimitedOrderBy::toString() const } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/passthrucommand-jl.cpp b/storage/columnstore/columnstore/dbcon/joblist/passthrucommand-jl.cpp index b512e37b..84e63f9c 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/passthrucommand-jl.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/passthrucommand-jl.cpp @@ -110,4 +110,3 @@ uint16_t PassThruCommandJL::getWidth() } }; // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/pcolscan.cpp b/storage/columnstore/columnstore/dbcon/joblist/pcolscan.cpp index aa6fd57b..2a3e64fb 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/pcolscan.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/pcolscan.cpp @@ -472,4 +472,3 @@ void pColScanStep::appendFilter(const std::vector<const execplan::Filter*>& fs) } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/pcolstep.cpp b/storage/columnstore/columnstore/dbcon/joblist/pcolstep.cpp index fe9a6d5c..3a314a7d 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/pcolstep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/pcolstep.cpp @@ -616,4 +616,3 @@ void pColStep::appendFilter(const std::vector<const execplan::Filter*>& fs) } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/pdictionaryscan.cpp b/storage/columnstore/columnstore/dbcon/joblist/pdictionaryscan.cpp index 08b65a70..910f0a8b 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/pdictionaryscan.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/pdictionaryscan.cpp @@ -929,4 +929,3 @@ uint16_t pDictionaryScan::planFlagsToPrimFlags(uint32_t planFlags) } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/primitivemsg.h b/storage/columnstore/columnstore/dbcon/joblist/primitivemsg.h index 3d467a8e..216182c9 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/primitivemsg.h +++ b/storage/columnstore/columnstore/dbcon/joblist/primitivemsg.h @@ -885,5 +885,4 @@ struct LbidAtVer #pragma pack(pop) -#endif // JOBLIST_PRIMITIVE_H -// vim:ts=4 sw=4: +#endif // JOBLIST_PRIMITIVE_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/primitivestep.h b/storage/columnstore/columnstore/dbcon/joblist/primitivestep.h index d20ef5a1..e25b3899 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/primitivestep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/primitivestep.h @@ -111,18 +111,24 @@ class pColStep : public JobStep pColStep(const PassThruStep& rhs); - virtual ~pColStep(){} + virtual ~pColStep() + { + } /** @brief Starts processing. Set at least the RID list before calling. * * Starts processing. Set at least the RID list before calling this. */ - virtual void run(){} + virtual void run() + { + } /** @brief Sync's the caller with the end of execution. * * Does nothing. Returns when this instance is finished. */ - virtual void join(){} + virtual void join() + { + } virtual const std::string toString() const; @@ -347,19 +353,25 @@ class pColScanStep : public JobStep const execplan::CalpontSystemCatalog::ColType& ct, const JobInfo& jobInfo); pColScanStep(const pColStep& rhs); - ~pColScanStep(){} + ~pColScanStep() + { + } /** @brief Starts processing. * * Starts processing. */ - virtual void run(){} + virtual void run() + { + } /** @brief Sync's the caller with the end of execution. * * Does nothing. Returns when this instance is finished. */ - virtual void join(){} + virtual void join() + { + } virtual bool isDictCol() const { @@ -549,12 +561,18 @@ class pDictionaryStep : public JobStep pDictionaryStep(execplan::CalpontSystemCatalog::OID oid, execplan::CalpontSystemCatalog::OID tabelOid, const execplan::CalpontSystemCatalog::ColType& ct, const JobInfo& jobInfo); - virtual ~pDictionaryStep(){} + virtual ~pDictionaryStep() + { + } /** @brief virtual void Run method */ - virtual void run(){} - virtual void join(){} + virtual void run() + { + } + virtual void join() + { + } // void setOutList(StringDataList* rids); void setInputList(DataList_t* rids) { @@ -1506,7 +1524,7 @@ class FilterStep : public JobStep protected: // void unblockDataLists(FifoDataList* fifo, StringFifoDataList* strFifo, StrDataList* strResult, - //DataList_t* result); + // DataList_t* result); private: // This i/f is not meaningful in this step @@ -1676,5 +1694,4 @@ class PseudoColStep : public pColStep } // namespace joblist -#endif // JOBLIST_PRIMITIVESTEP_H -// vim:ts=4 sw=4: +#endif // JOBLIST_PRIMITIVESTEP_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/rowestimator.cpp b/storage/columnstore/columnstore/dbcon/joblist/rowestimator.cpp index 9babae7c..fa7e8920 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/rowestimator.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/rowestimator.cpp @@ -269,8 +269,8 @@ float RowEstimator::estimateRowReturnFactor(const BRM::EMEntry& emEntry, const m float tempFactor = 1.0; uint64_t adjustedMin = 0, adjustedMax = 0; - uint128_t adjustedBigMin, adjustedBigMax; - uint32_t distinctValuesEstimate; + uint128_t adjustedBigMin = 0, adjustedBigMax = 0; + uint32_t distinctValuesEstimate = 0; // Adjust values based on column type and estimate the if (!ct.isWideDecimalType()) diff --git a/storage/columnstore/columnstore/dbcon/joblist/subquerystep.cpp b/storage/columnstore/columnstore/dbcon/joblist/subquerystep.cpp index a019c24f..fbc46912 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/subquerystep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/subquerystep.cpp @@ -533,4 +533,3 @@ void SubAdapterStep::formatMiniStats() } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/subquerystep.h b/storage/columnstore/columnstore/dbcon/joblist/subquerystep.h index fb0eca13..e7a10f57 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/subquerystep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/subquerystep.h @@ -274,5 +274,4 @@ class SubAdapterStep : public JobStep, public TupleDeliveryStep } // namespace joblist -#endif // SUBQUERY_STEP_H -// vim:ts=4 sw=4: +#endif // SUBQUERY_STEP_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/subquerytransformer.cpp b/storage/columnstore/columnstore/dbcon/joblist/subquerytransformer.cpp index 816b6aa7..48f1cc2d 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/subquerytransformer.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/subquerytransformer.cpp @@ -622,4 +622,3 @@ void SimpleScalarTransformer::getScalarResult() } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/tuple-bps.cpp b/storage/columnstore/columnstore/dbcon/joblist/tuple-bps.cpp index f9a6d736..c730e494 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tuple-bps.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/tuple-bps.cpp @@ -3334,4 +3334,3 @@ template bool TupleBPS::compareSingleValue<int64_t>(uint8_t COP, int64_t val1, i template bool TupleBPS::compareSingleValue<int128_t>(uint8_t COP, int128_t val1, int128_t val2) const; } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/tupleaggregatestep.cpp b/storage/columnstore/columnstore/dbcon/joblist/tupleaggregatestep.cpp index 3f06ed1c..16ce5611 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tupleaggregatestep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/tupleaggregatestep.cpp @@ -5962,4 +5962,3 @@ void TupleAggregateStep::formatMiniStats() } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/tupleaggregatestep.h b/storage/columnstore/columnstore/dbcon/joblist/tupleaggregatestep.h index 95d6ee42..f15c87bc 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tupleaggregatestep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/tupleaggregatestep.h @@ -225,6 +225,4 @@ class TupleAggregateStep : public JobStep, public TupleDeliveryStep } // namespace joblist -#endif // JOBLIST_TUPLEAGGREGATESTEP_H - -// vim:ts=4 sw=4: +#endif // JOBLIST_TUPLEAGGREGATESTEP_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp b/storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp index f6a7d70c..b93e4137 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.cpp @@ -1258,4 +1258,3 @@ void TupleAnnexStep::formatMiniStats() } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.h b/storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.h index 96cc0064..fa761262 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/tupleannexstep.h @@ -194,6 +194,4 @@ class reservablePQ : private std::priority_queue<T> } // namespace joblist -#endif // JOBLIST_TUPLEANNEXSTEP_H - -// vim:ts=4 sw=4: +#endif // JOBLIST_TUPLEANNEXSTEP_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/tupleconstantstep.cpp b/storage/columnstore/columnstore/dbcon/joblist/tupleconstantstep.cpp index ee252ec0..065b087d 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tupleconstantstep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/tupleconstantstep.cpp @@ -842,4 +842,3 @@ const string TupleConstantBooleanStep::toString() const } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/tupleconstantstep.h b/storage/columnstore/columnstore/dbcon/joblist/tupleconstantstep.h index 0aca68ff..e1bd3b93 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tupleconstantstep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/tupleconstantstep.h @@ -190,6 +190,4 @@ class TupleConstantBooleanStep : public TupleConstantStep } // namespace joblist -#endif // JOBLIST_TUPLECONSTANTSTEP_H - -// vim:ts=4 sw=4: +#endif // JOBLIST_TUPLECONSTANTSTEP_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/tuplehashjoin.cpp b/storage/columnstore/columnstore/dbcon/joblist/tuplehashjoin.cpp index 8625723e..0b646b46 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tuplehashjoin.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/tuplehashjoin.cpp @@ -2017,4 +2017,3 @@ void TupleHashJoinStep::abort() } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/tuplehashjoin.h b/storage/columnstore/columnstore/dbcon/joblist/tuplehashjoin.h index 8531cfd7..45ee8729 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tuplehashjoin.h +++ b/storage/columnstore/columnstore/dbcon/joblist/tuplehashjoin.h @@ -653,5 +653,4 @@ class TupleHashJoinStep : public JobStep, public TupleDeliveryStep } // namespace joblist -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/joblist/tuplehavingstep.cpp b/storage/columnstore/columnstore/dbcon/joblist/tuplehavingstep.cpp index 701e77b3..60496895 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tuplehavingstep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/tuplehavingstep.cpp @@ -408,4 +408,3 @@ void TupleHavingStep::formatMiniStats() } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/tuplehavingstep.h b/storage/columnstore/columnstore/dbcon/joblist/tuplehavingstep.h index 068f3d35..eae7ae0c 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/tuplehavingstep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/tuplehavingstep.h @@ -117,5 +117,3 @@ class TupleHavingStep : public ExpressionStep, public TupleDeliveryStep } // namespace joblist #endif // JOBLIST_TUPLEHAVINGSTEP_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/virtualtable.cpp b/storage/columnstore/columnstore/dbcon/joblist/virtualtable.cpp index dc9bf275..8fe1ec67 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/virtualtable.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/virtualtable.cpp @@ -158,4 +158,3 @@ const CalpontSystemCatalog::ColType& VirtualTable::columnType(uint32_t i) const } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/windowfunctionstep.cpp b/storage/columnstore/columnstore/dbcon/joblist/windowfunctionstep.cpp index 1ab8d398..ab7b8ca8 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/windowfunctionstep.cpp +++ b/storage/columnstore/columnstore/dbcon/joblist/windowfunctionstep.cpp @@ -1599,4 +1599,3 @@ void WindowFunctionStep::formatMiniStats() } } // namespace joblist -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/joblist/windowfunctionstep.h b/storage/columnstore/columnstore/dbcon/joblist/windowfunctionstep.h index e2f03eb4..fb5597e7 100644 --- a/storage/columnstore/columnstore/dbcon/joblist/windowfunctionstep.h +++ b/storage/columnstore/columnstore/dbcon/joblist/windowfunctionstep.h @@ -226,6 +226,4 @@ class WindowFunctionStep : public JobStep, public TupleDeliveryStep } // namespace joblist -#endif // JOBLIST_WINDOWFUNCTIONSTEP_H - -// vim:ts=4 sw=4: +#endif // JOBLIST_WINDOWFUNCTIONSTEP_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/mysql/ha_autoi.cpp b/storage/columnstore/columnstore/dbcon/mysql/ha_autoi.cpp index ddfbcdc2..4b9a2ae3 100644 --- a/storage/columnstore/columnstore/dbcon/mysql/ha_autoi.cpp +++ b/storage/columnstore/columnstore/dbcon/mysql/ha_autoi.cpp @@ -176,4 +176,3 @@ bool parseAutoincrementColumnComment(std::string comment, uint64_t& startValue) return autoincrement; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_datatype.h b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_datatype.h index 2f9e625d..b0fd54a6 100644 --- a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_datatype.h +++ b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_datatype.h @@ -842,6 +842,4 @@ class WriteBatchFieldMariaDB : public WriteBatchField } // end of namespace datatypes -#endif - -// vim:ts=2 sw=2: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp index 2d18688f..305b8e07 100644 --- a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp +++ b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_ddl.cpp @@ -2810,4 +2810,3 @@ extern "C" } } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp index bd142382..a3f97db7 100644 --- a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp +++ b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_dml.cpp @@ -1001,4 +1001,3 @@ int ha_mcs_impl_close_connection_(handlerton* hton, THD* thd, cal_connection_inf return rc; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp index 55f6de40..798e5af8 100644 --- a/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp +++ b/storage/columnstore/columnstore/dbcon/mysql/ha_mcs_execplan.cpp @@ -10481,4 +10481,3 @@ int getGroupPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, cal_gro } } // namespace cal_impl_if -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/mysql/ha_pseudocolumn.cpp b/storage/columnstore/columnstore/dbcon/mysql/ha_pseudocolumn.cpp index 5b1010e8..48811328 100644 --- a/storage/columnstore/columnstore/dbcon/mysql/ha_pseudocolumn.cpp +++ b/storage/columnstore/columnstore/dbcon/mysql/ha_pseudocolumn.cpp @@ -584,4 +584,3 @@ execplan::ReturnedColumn* buildPseudoColumn(Item* item, gp_walk_info& gwi, bool& } } // namespace cal_impl_if -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dbcon/mysql/idb_mysql.h b/storage/columnstore/columnstore/dbcon/mysql/idb_mysql.h index bc966ffc..06911c6c 100644 --- a/storage/columnstore/columnstore/dbcon/mysql/idb_mysql.h +++ b/storage/columnstore/columnstore/dbcon/mysql/idb_mysql.h @@ -33,8 +33,8 @@ bool isnan(T); #endif #endif -//#define INFINIDB_DEBUG -//#define DEBUG_WALK_COND +// #define INFINIDB_DEBUG +// #define DEBUG_WALK_COND #define MYSQL_SERVER 1 // needed for definition of struct THD in mysql_priv.h #define USE_CALPONT_REGEX @@ -119,5 +119,4 @@ inline char* idb_mysql_query_str(THD* thd) } } // namespace -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/ddlproc/ddlproc.cpp b/storage/columnstore/columnstore/ddlproc/ddlproc.cpp index e479fbf4..f203f85d 100644 --- a/storage/columnstore/columnstore/ddlproc/ddlproc.cpp +++ b/storage/columnstore/columnstore/ddlproc/ddlproc.cpp @@ -248,4 +248,3 @@ int main(int argc, char** argv) return ServiceDDLProc(opt).Run(); } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/ddlproc/ddlprocessor.cpp b/storage/columnstore/columnstore/ddlproc/ddlprocessor.cpp index eb6f3d09..cca42af1 100644 --- a/storage/columnstore/columnstore/ddlproc/ddlprocessor.cpp +++ b/storage/columnstore/columnstore/ddlproc/ddlprocessor.cpp @@ -876,4 +876,3 @@ int DDLProcessor::commitTransaction(uint32_t txnID, std::string& errorMsg) return rc; } } // namespace ddlprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dmlproc/batchinsertprocessor.cpp b/storage/columnstore/columnstore/dmlproc/batchinsertprocessor.cpp index 1a61e1eb..48307417 100644 --- a/storage/columnstore/columnstore/dmlproc/batchinsertprocessor.cpp +++ b/storage/columnstore/columnstore/dmlproc/batchinsertprocessor.cpp @@ -547,4 +547,3 @@ void BatchInsertProc::getError(int& errorCode, std::string& errMsg) errMsg = fErrMsg; } } // namespace dmlprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dmlproc/batchinsertprocessor.h b/storage/columnstore/columnstore/dmlproc/batchinsertprocessor.h index c7cccb1d..f889c89c 100644 --- a/storage/columnstore/columnstore/dmlproc/batchinsertprocessor.h +++ b/storage/columnstore/columnstore/dmlproc/batchinsertprocessor.h @@ -94,5 +94,4 @@ class BatchInsertProc }; } // namespace dmlprocessor -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/dmlproc/dmlproc.cpp b/storage/columnstore/columnstore/dmlproc/dmlproc.cpp index f1fa9cc4..fb79ae59 100644 --- a/storage/columnstore/columnstore/dmlproc/dmlproc.cpp +++ b/storage/columnstore/columnstore/dmlproc/dmlproc.cpp @@ -639,14 +639,7 @@ int ServiceDMLProc::Child() // Couldn't check the return code b/c // fuser returns 1 for unused port. -#if defined(__GNUC__) && __GNUC__ >= 5 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-result" - (void)::system(cmd.c_str()); -#pragma GCC diagnostic pop -#else - (void)::system(cmd.c_str()); -#endif + std::ignore = ::system(cmd.c_str()); } catch (...) { @@ -698,4 +691,3 @@ int main(int argc, char** argv) return ServiceDMLProc(opt).Run(); } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dmlproc/dmlprocessor.cpp b/storage/columnstore/columnstore/dmlproc/dmlprocessor.cpp index 33e9b3d1..0cc5337a 100644 --- a/storage/columnstore/columnstore/dmlproc/dmlprocessor.cpp +++ b/storage/columnstore/columnstore/dmlproc/dmlprocessor.cpp @@ -2001,4 +2001,3 @@ void DMLProcessor::log(const std::string& msg, logging::LOG_TYPE level) } } // namespace dmlprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/dmlproc/dmlprocessor.h b/storage/columnstore/columnstore/dmlproc/dmlprocessor.h index b1863600..35465cda 100644 --- a/storage/columnstore/columnstore/dmlproc/dmlprocessor.h +++ b/storage/columnstore/columnstore/dmlproc/dmlprocessor.h @@ -331,5 +331,4 @@ class RollbackTransactionProcessor : public dmlpackageprocessor::DMLPackageProce } // namespace dmlprocessor -#endif // DMLPROCESSOR_H -// vim:ts=4 sw=4: +#endif // DMLPROCESSOR_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/exemgr/activestatementcounter.cpp b/storage/columnstore/columnstore/exemgr/activestatementcounter.cpp index 27a3df1d..b25e6154 100644 --- a/storage/columnstore/columnstore/exemgr/activestatementcounter.cpp +++ b/storage/columnstore/columnstore/exemgr/activestatementcounter.cpp @@ -57,4 +57,3 @@ void ActiveStatementCounter::decr(bool& counted) --fStatementCount; condvar.notify_one(); } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/exemgr/activestatementcounter.h b/storage/columnstore/columnstore/exemgr/activestatementcounter.h index e8e75c58..fbbf953c 100644 --- a/storage/columnstore/columnstore/exemgr/activestatementcounter.h +++ b/storage/columnstore/columnstore/exemgr/activestatementcounter.h @@ -63,5 +63,4 @@ class ActiveStatementCounter BRM::VSS fVss; }; -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/exemgr/main.cpp b/storage/columnstore/columnstore/exemgr/main.cpp index 513cc075..abb0991c 100644 --- a/storage/columnstore/columnstore/exemgr/main.cpp +++ b/storage/columnstore/columnstore/exemgr/main.cpp @@ -1825,4 +1825,3 @@ int main(int argc, char* argv[]) return ServiceExeMgr(opt).Run(); } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/oam/oamcpp/liboamcpp.cpp b/storage/columnstore/columnstore/oam/oamcpp/liboamcpp.cpp index d33ac883..47153584 100644 --- a/storage/columnstore/columnstore/oam/oamcpp/liboamcpp.cpp +++ b/storage/columnstore/columnstore/oam/oamcpp/liboamcpp.cpp @@ -1063,4 +1063,3 @@ std::string Oam::itoa(const int i) return ss.str(); } } // namespace oam -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/oam/oamcpp/liboamcpp.h b/storage/columnstore/columnstore/oam/oamcpp/liboamcpp.h index 504a537d..7e762ff0 100644 --- a/storage/columnstore/columnstore/oam/oamcpp/liboamcpp.h +++ b/storage/columnstore/columnstore/oam/oamcpp/liboamcpp.h @@ -425,5 +425,4 @@ class Oam #undef EXPORT -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/oamapps/columnstoreDB/columnstoreDB.cpp b/storage/columnstore/columnstore/oamapps/columnstoreDB/columnstoreDB.cpp index f716f9bd..3bdca8b6 100644 --- a/storage/columnstore/columnstore/oamapps/columnstoreDB/columnstoreDB.cpp +++ b/storage/columnstore/columnstore/oamapps/columnstoreDB/columnstoreDB.cpp @@ -271,7 +271,7 @@ int main(int argc, char** argv) Oam oam; BRM::DBRM dbrm; - char c; + signed char c; // Invokes member function `int operator ()(void);' while ((c = getopt(argc, argv, "c:h")) != -1) diff --git a/storage/columnstore/columnstore/oamapps/postConfigure/mycnfUpgrade.cpp b/storage/columnstore/columnstore/oamapps/postConfigure/mycnfUpgrade.cpp index d46bd773..a5b51dec 100644 --- a/storage/columnstore/columnstore/oamapps/postConfigure/mycnfUpgrade.cpp +++ b/storage/columnstore/columnstore/oamapps/postConfigure/mycnfUpgrade.cpp @@ -284,4 +284,3 @@ int main(int argc, char* argv[]) exit(0); } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/oamapps/sessionWalker/sessionwalker.cpp b/storage/columnstore/columnstore/oamapps/sessionWalker/sessionwalker.cpp index 5f096012..06cf08bd 100644 --- a/storage/columnstore/columnstore/oamapps/sessionWalker/sessionwalker.cpp +++ b/storage/columnstore/columnstore/oamapps/sessionWalker/sessionwalker.cpp @@ -133,4 +133,3 @@ int main(int argc, char** argv) return 0; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/primitives/blockcache/blockcacheclient.h b/storage/columnstore/columnstore/primitives/blockcache/blockcacheclient.h index ccdb5b16..c4b06c7b 100644 --- a/storage/columnstore/columnstore/primitives/blockcache/blockcacheclient.h +++ b/storage/columnstore/columnstore/primitives/blockcache/blockcacheclient.h @@ -177,5 +177,4 @@ class blockCacheClient } // namespace dbbc -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/primitives/blockcache/blockrequestprocessor.h b/storage/columnstore/columnstore/primitives/blockcache/blockrequestprocessor.h index edb1479f..3a1de568 100644 --- a/storage/columnstore/columnstore/primitives/blockcache/blockrequestprocessor.h +++ b/storage/columnstore/columnstore/primitives/blockcache/blockrequestprocessor.h @@ -191,5 +191,4 @@ class BlockRequestProcessor }; } // namespace dbbc -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/primitives/blockcache/filerequest.h b/storage/columnstore/columnstore/primitives/blockcache/filerequest.h index 19bd9256..0ede2eef 100644 --- a/storage/columnstore/columnstore/primitives/blockcache/filerequest.h +++ b/storage/columnstore/columnstore/primitives/blockcache/filerequest.h @@ -321,5 +321,4 @@ class fileRequest } // namespace dbbc -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp b/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp index 81eb787c..d8cae6f3 100644 --- a/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp +++ b/storage/columnstore/columnstore/primitives/blockcache/iomanager.cpp @@ -1442,4 +1442,3 @@ void ioManager::handleBlockReadError(fileRequest* fr, const string& errMsg, bool } } // namespace dbbc -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/primitives/blockcache/iomanager.h b/storage/columnstore/columnstore/primitives/blockcache/iomanager.h index 6cf61569..546675d7 100644 --- a/storage/columnstore/columnstore/primitives/blockcache/iomanager.h +++ b/storage/columnstore/columnstore/primitives/blockcache/iomanager.h @@ -43,7 +43,7 @@ #include "fileblockrequestqueue.h" #include "filebuffermgr.h" -//#define SHARED_NOTHING_DEMO_2 +// #define SHARED_NOTHING_DEMO_2 namespace dbbc { @@ -148,5 +148,4 @@ void dropFDCache(); void purgeFDCache(std::vector<BRM::FileInfo>& files); } // namespace dbbc -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/primitives/linux-port/column.cpp b/storage/columnstore/columnstore/primitives/linux-port/column.cpp index fb13ffba..f07416a2 100644 --- a/storage/columnstore/columnstore/primitives/linux-port/column.cpp +++ b/storage/columnstore/columnstore/primitives/linux-port/column.cpp @@ -18,7 +18,7 @@ #include <iostream> #include <sstream> -//#define NDEBUG +// #define NDEBUG #include <cassert> #include <cmath> #include <functional> @@ -1636,7 +1636,7 @@ template <typename T, typename std::enable_if<sizeof(T) == sizeof(int8_t) || siz T>::type* = nullptr> // gcc >= 5 #else sizeof(T) == sizeof(int128_t), - T>::type*> // gcc 4.8.5 + T>::type*> // gcc 4.8.5 #endif #else sizeof(T) == sizeof(int128_t), @@ -1672,7 +1672,7 @@ template <typename T, #if ___GNUC__ >= 5 typename std::enable_if<sizeof(T) <= sizeof(int64_t), T>::type* = nullptr> // gcc >= 5 #else - typename std::enable_if<sizeof(T) <= sizeof(int64_t), T>::type*> // gcc 4.8.5 + typename std::enable_if<sizeof(T) <= sizeof(int64_t), T>::type*> // gcc 4.8.5 #endif #else typename std::enable_if<sizeof(T) <= sizeof(int64_t), T>::type* = nullptr> @@ -1763,5 +1763,4 @@ template void primitives::PrimitiveProcessor::columnScanAndFilter<int64_t>(NewCo template void primitives::PrimitiveProcessor::columnScanAndFilter<int128_t>(NewColRequestHeader*, ColResultHeader*); -} // namespace primitives -// vim:ts=4 sw=4: +} // namespace primitives
\ No newline at end of file diff --git a/storage/columnstore/columnstore/primitives/linux-port/dictionary.cpp b/storage/columnstore/columnstore/primitives/linux-port/dictionary.cpp index 2942d4fd..360d8b60 100644 --- a/storage/columnstore/columnstore/primitives/linux-port/dictionary.cpp +++ b/storage/columnstore/columnstore/primitives/linux-port/dictionary.cpp @@ -620,4 +620,3 @@ void PrimitiveProcessor::p_Dictionary(const DictInput* in, vector<uint8_t>* out, } } // namespace primitives -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/primitives/linux-port/index.cpp b/storage/columnstore/columnstore/primitives/linux-port/index.cpp index bbfc949e..2d86d35e 100644 --- a/storage/columnstore/columnstore/primitives/linux-port/index.cpp +++ b/storage/columnstore/columnstore/primitives/linux-port/index.cpp @@ -1130,4 +1130,3 @@ void PrimitiveProcessor::p_IdxList(const IndexListHeader* rqst, IndexListHeader* } } // namespace primitives -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h b/storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h index baaf054f..453d41d8 100644 --- a/storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h +++ b/storage/columnstore/columnstore/primitives/linux-port/primitiveprocessor.h @@ -563,5 +563,4 @@ boost::shared_ptr<ParsedColumnFilter> _parseColumnFilter( } // namespace primitives -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.cpp b/storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.cpp index e16b7ff1..5d898d05 100644 --- a/storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.cpp +++ b/storage/columnstore/columnstore/primitives/primproc/batchprimitiveprocessor.cpp @@ -2806,4 +2806,3 @@ void BatchPrimitiveProcessor::buildVSSCache(uint32_t loopCount) } } // namespace primitiveprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/primitives/primproc/columncommand.cpp b/storage/columnstore/columnstore/primitives/primproc/columncommand.cpp index 16426f49..a7069359 100644 --- a/storage/columnstore/columnstore/primitives/primproc/columncommand.cpp +++ b/storage/columnstore/columnstore/primitives/primproc/columncommand.cpp @@ -1226,4 +1226,3 @@ void ColumnCommandInt128::issuePrimitive() } } // namespace primitiveprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/primitives/primproc/columncommand.h b/storage/columnstore/columnstore/primitives/primproc/columncommand.h index b3ec49d7..c260f23d 100644 --- a/storage/columnstore/columnstore/primitives/primproc/columncommand.h +++ b/storage/columnstore/columnstore/primitives/primproc/columncommand.h @@ -307,5 +307,4 @@ inline void ColumnCommand::fillEmptyBlock<messageqcpp::ByteStream::hexbyte>(uint } // namespace primitiveprocessor -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp b/storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp index 99aa7a31..19c1f6a4 100644 --- a/storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp +++ b/storage/columnstore/columnstore/primitives/primproc/primitiveserver.cpp @@ -2575,4 +2575,3 @@ bool BPPV::aborted() // end workaround } // namespace primitiveprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/primitives/primproc/primproc.cpp b/storage/columnstore/columnstore/primitives/primproc/primproc.cpp index 96ab2088..ce757c32 100644 --- a/storage/columnstore/columnstore/primitives/primproc/primproc.cpp +++ b/storage/columnstore/columnstore/primitives/primproc/primproc.cpp @@ -786,4 +786,3 @@ int main(int argc, char** argv) return ServicePrimProc(opt).Run(); } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/primitives/primproc/udf.cpp b/storage/columnstore/columnstore/primitives/primproc/udf.cpp index 7a836590..188e5128 100644 --- a/storage/columnstore/columnstore/primitives/primproc/udf.cpp +++ b/storage/columnstore/columnstore/primitives/primproc/udf.cpp @@ -69,4 +69,3 @@ void loadUDFs() } } // namespace primitiveprocessor -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/storage-manager/src/smcat.cpp b/storage/columnstore/columnstore/storage-manager/src/smcat.cpp index e931ec8a..48dc5077 100644 --- a/storage/columnstore/columnstore/storage-manager/src/smcat.cpp +++ b/storage/columnstore/columnstore/storage-manager/src/smcat.cpp @@ -94,7 +94,7 @@ void catFileOffline(const char* filename, int prefixlen) void catFileOnline(const char* filename, int prefixlen) { uint8_t data[8192]; - off_t offset = 0; + [[maybe_unused]] off_t offset = 0; int read_err, write_err, count; idbdatafile::SMDataFile df(filename, O_RDONLY, 0); diff --git a/storage/columnstore/columnstore/storage-manager/src/unit_tests.cpp b/storage/columnstore/columnstore/storage-manager/src/unit_tests.cpp index 3d2e7ec2..dc37007a 100644 --- a/storage/columnstore/columnstore/storage-manager/src/unit_tests.cpp +++ b/storage/columnstore/columnstore/storage-manager/src/unit_tests.cpp @@ -1063,10 +1063,10 @@ bool copytask(bool connectionTest = false) copy_cmd* cmd = (copy_cmd*)buf; cmd->opcode = COPY; cmd->file1.flen = strlen(source); - strncpy(cmd->file1.filename, source, cmd->file1.flen); + memcpy(cmd->file1.filename, source, cmd->file1.flen); f_name* file2 = (f_name*)&cmd->file1.filename[cmd->file1.flen]; file2->flen = strlen(dest); - strncpy(file2->filename, dest, file2->flen); + memcpy(file2->filename, dest, file2->flen); uint len = (uint64_t)&file2->filename[file2->flen] - (uint64_t)buf; diff --git a/storage/columnstore/columnstore/tests/primitives_column_scan_and_filter.cpp b/storage/columnstore/columnstore/tests/primitives_column_scan_and_filter.cpp index 70f921b3..eeed651e 100644 --- a/storage/columnstore/columnstore/tests/primitives_column_scan_and_filter.cpp +++ b/storage/columnstore/columnstore/tests/primitives_column_scan_and_filter.cpp @@ -965,4 +965,3 @@ TEST_F(ColumnScanFilterTest, ColumnScan16Bytes2CompFilters) EXPECT_EQ(out->Max, __col16block_cdf_umax); EXPECT_EQ(out->Min, __col16block_cdf_umin); } -// vim:ts=2 sw=2: diff --git a/storage/columnstore/columnstore/tests/primitives_scan_bench.cpp b/storage/columnstore/columnstore/tests/primitives_scan_bench.cpp index 2d6b77c9..c2431b8d 100644 --- a/storage/columnstore/columnstore/tests/primitives_scan_bench.cpp +++ b/storage/columnstore/columnstore/tests/primitives_scan_bench.cpp @@ -427,4 +427,3 @@ BENCHMARK_DEFINE_F(FilterBenchFixture, BM_ColumnScan8Byte1FilterVectorizedCode)( BENCHMARK_REGISTER_F(FilterBenchFixture, BM_ColumnScan8Byte1FilterVectorizedCode); BENCHMARK_MAIN(); -// vim:ts=2 sw=2: diff --git a/storage/columnstore/columnstore/tools/bincvt/li2bin.cpp b/storage/columnstore/columnstore/tools/bincvt/li2bin.cpp index 51b1d8b6..91bf9c4c 100644 --- a/storage/columnstore/columnstore/tools/bincvt/li2bin.cpp +++ b/storage/columnstore/columnstore/tools/bincvt/li2bin.cpp @@ -278,4 +278,3 @@ int main(int argc, char** argv) return 0; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/tools/clearShm/main.cpp b/storage/columnstore/columnstore/tools/clearShm/main.cpp index e37e27db..d31f9a75 100644 --- a/storage/columnstore/columnstore/tools/clearShm/main.cpp +++ b/storage/columnstore/columnstore/tools/clearShm/main.cpp @@ -221,4 +221,3 @@ int main(int argc, char** argv) return 0; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/tools/dbbuilder/dbbuilder.cpp b/storage/columnstore/columnstore/tools/dbbuilder/dbbuilder.cpp index 38b9ffd5..79d2a4be 100644 --- a/storage/columnstore/columnstore/tools/dbbuilder/dbbuilder.cpp +++ b/storage/columnstore/columnstore/tools/dbbuilder/dbbuilder.cpp @@ -324,4 +324,3 @@ int main(int argc, char* argv[]) return 1; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/tools/ddlcleanup/ddlcleanup.cpp b/storage/columnstore/columnstore/tools/ddlcleanup/ddlcleanup.cpp index bbbbac43..6d1ca008 100644 --- a/storage/columnstore/columnstore/tools/ddlcleanup/ddlcleanup.cpp +++ b/storage/columnstore/columnstore/tools/ddlcleanup/ddlcleanup.cpp @@ -80,4 +80,3 @@ int main(int argc, char** argv) return ddlcleanuputil::ddl_cleanup(); } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/tools/editem/editem.cpp b/storage/columnstore/columnstore/tools/editem/editem.cpp index 2dcb6ce8..bce63ed0 100644 --- a/storage/columnstore/columnstore/tools/editem/editem.cpp +++ b/storage/columnstore/columnstore/tools/editem/editem.cpp @@ -1040,4 +1040,3 @@ int main(int argc, char** argv) return 0; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/tools/qfe/server.cpp b/storage/columnstore/columnstore/tools/qfe/server.cpp index 018cf470..7b3276de 100644 --- a/storage/columnstore/columnstore/tools/qfe/server.cpp +++ b/storage/columnstore/columnstore/tools/qfe/server.cpp @@ -513,4 +513,3 @@ int main(int argc, char** argv) return 0; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/tools/sendPlan/sendplan.cpp b/storage/columnstore/columnstore/tools/sendPlan/sendplan.cpp index 5374d867..bd8f4bb4 100644 --- a/storage/columnstore/columnstore/tools/sendPlan/sendplan.cpp +++ b/storage/columnstore/columnstore/tools/sendPlan/sendplan.cpp @@ -390,4 +390,3 @@ int main(int argc, char** argv) return 0; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/tools/setConfig/main.cpp b/storage/columnstore/columnstore/tools/setConfig/main.cpp index 1c536167..7d7fe396 100644 --- a/storage/columnstore/columnstore/tools/setConfig/main.cpp +++ b/storage/columnstore/columnstore/tools/setConfig/main.cpp @@ -148,4 +148,3 @@ int main(int argc, char** argv) return 0; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/cacheutils/cacheutils.cpp b/storage/columnstore/columnstore/utils/cacheutils/cacheutils.cpp index ead2483a..a0042e15 100644 --- a/storage/columnstore/columnstore/utils/cacheutils/cacheutils.cpp +++ b/storage/columnstore/columnstore/utils/cacheutils/cacheutils.cpp @@ -354,4 +354,3 @@ int purgePrimProcFdCache(const std::vector<BRM::FileInfo> files, const int pmId) } } // namespace cacheutils -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/cacheutils/cacheutils.h b/storage/columnstore/columnstore/utils/cacheutils/cacheutils.h index 13d01ef6..fdc01da7 100644 --- a/storage/columnstore/columnstore/utils/cacheutils/cacheutils.h +++ b/storage/columnstore/columnstore/utils/cacheutils/cacheutils.h @@ -73,6 +73,4 @@ int dropPrimProcFdCache(); int purgePrimProcFdCache(const std::vector<BRM::FileInfo> files, const int pmId); } // namespace cacheutils -// vim:ts=4 sw=4: - #endif diff --git a/storage/columnstore/columnstore/utils/common/hashfamily.h b/storage/columnstore/columnstore/utils/common/hashfamily.h index 6733beaf..eb40a4df 100644 --- a/storage/columnstore/columnstore/utils/common/hashfamily.h +++ b/storage/columnstore/columnstore/utils/common/hashfamily.h @@ -51,5 +51,4 @@ class HashFamily }; } // namespace utils -#endif -// vim:ts=2 sw=2: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/common/mcs_basic_types.h b/storage/columnstore/columnstore/utils/common/mcs_basic_types.h index 2e1caf32..e19f78a8 100644 --- a/storage/columnstore/columnstore/utils/common/mcs_basic_types.h +++ b/storage/columnstore/columnstore/utils/common/mcs_basic_types.h @@ -22,5 +22,4 @@ using int128_t = __int128; using uint128_t = unsigned __int128; -#endif // MCS_BASIC_TYPES_H_INCLUDED -// vim:ts=2 sw=2: +#endif // MCS_BASIC_TYPES_H_INCLUDED
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/common/simd_sse.h b/storage/columnstore/columnstore/utils/common/simd_sse.h index c7da2ec0..d9873414 100644 --- a/storage/columnstore/columnstore/utils/common/simd_sse.h +++ b/storage/columnstore/columnstore/utils/common/simd_sse.h @@ -892,4 +892,3 @@ class SimdFilterProcessor< } // namespace simd #endif // if defined(__x86_64__ ) -// vim:ts=2 sw=2: diff --git a/storage/columnstore/columnstore/utils/compress/idbcompress.cpp b/storage/columnstore/columnstore/utils/compress/idbcompress.cpp index a0a98387..adc7a9cd 100644 --- a/storage/columnstore/columnstore/utils/compress/idbcompress.cpp +++ b/storage/columnstore/columnstore/utils/compress/idbcompress.cpp @@ -672,4 +672,3 @@ std::shared_ptr<CompressInterface> getCompressorByType( #endif } // namespace compress -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/configcpp/configcpp.cpp b/storage/columnstore/columnstore/utils/configcpp/configcpp.cpp index a7194ef7..e102a0cb 100644 --- a/storage/columnstore/columnstore/utils/configcpp/configcpp.cpp +++ b/storage/columnstore/columnstore/utils/configcpp/configcpp.cpp @@ -669,4 +669,3 @@ std::string Config::getTempFileDir(Config::TempDirPurpose what) } } // namespace config -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/configcpp/configcpp.h b/storage/columnstore/columnstore/utils/configcpp/configcpp.h index f573f292..35f290e8 100644 --- a/storage/columnstore/columnstore/utils/configcpp/configcpp.h +++ b/storage/columnstore/columnstore/utils/configcpp/configcpp.h @@ -244,5 +244,4 @@ class Config #undef EXPORT -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/configcpp/configstream.cpp b/storage/columnstore/columnstore/utils/configcpp/configstream.cpp index 059f690e..cfb1a4ac 100644 --- a/storage/columnstore/columnstore/utils/configcpp/configstream.cpp +++ b/storage/columnstore/columnstore/utils/configcpp/configstream.cpp @@ -64,4 +64,3 @@ void ConfigStream::init(const xmlChar* xp) } } // namespace config -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/configcpp/configstream.h b/storage/columnstore/columnstore/utils/configcpp/configstream.h index b42c6506..8c32e31d 100644 --- a/storage/columnstore/columnstore/utils/configcpp/configstream.h +++ b/storage/columnstore/columnstore/utils/configcpp/configstream.h @@ -62,5 +62,4 @@ class ConfigStream } // namespace config -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/configcpp/xmlparser.cpp b/storage/columnstore/columnstore/utils/configcpp/xmlparser.cpp index 03da1f95..37b6bdde 100644 --- a/storage/columnstore/columnstore/utils/configcpp/xmlparser.cpp +++ b/storage/columnstore/columnstore/utils/configcpp/xmlparser.cpp @@ -285,4 +285,3 @@ const vector<string> XMLParser::enumSection(const xmlDocPtr doc, const string& s } } // namespace config -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/configcpp/xmlparser.h b/storage/columnstore/columnstore/utils/configcpp/xmlparser.h index 48467d24..c1804992 100644 --- a/storage/columnstore/columnstore/utils/configcpp/xmlparser.h +++ b/storage/columnstore/columnstore/utils/configcpp/xmlparser.h @@ -64,5 +64,4 @@ class XMLParser } // namespace config -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/dataconvert/dataconvert.cpp b/storage/columnstore/columnstore/utils/dataconvert/dataconvert.cpp index 14195433..37ff38c4 100644 --- a/storage/columnstore/columnstore/utils/dataconvert/dataconvert.cpp +++ b/storage/columnstore/columnstore/utils/dataconvert/dataconvert.cpp @@ -1418,7 +1418,7 @@ boost::any DataConvert::StringToUDecimal(const datatypes::SystemCatalog::TypeAtt { int64_t val64; number_int_value(data, typeCode, colType, pushWarning, prm.noRoundup(), val64); - char ival = (char)val64; + signed char ival = (signed char)val64; if (ival < 0 && ival != static_cast<int8_t>(joblist::TINYINTEMPTYROW) && ival != static_cast<int8_t>(joblist::TINYINTNULL)) @@ -3388,4 +3388,3 @@ void DataConvert::joinColTypeForUnion(datatypes::SystemCatalog::TypeHolderStd& u } } // namespace dataconvert -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/ddlcleanup/ddlcleanuputil.cpp b/storage/columnstore/columnstore/utils/ddlcleanup/ddlcleanuputil.cpp index a9defdf4..ca196c29 100644 --- a/storage/columnstore/columnstore/utils/ddlcleanup/ddlcleanuputil.cpp +++ b/storage/columnstore/columnstore/utils/ddlcleanup/ddlcleanuputil.cpp @@ -270,4 +270,3 @@ int ddl_cleanup() } } // namespace ddlcleanuputil -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/ddlcleanup/ddlcleanuputil.h b/storage/columnstore/columnstore/utils/ddlcleanup/ddlcleanuputil.h index 7eebdf15..b76052fa 100644 --- a/storage/columnstore/columnstore/utils/ddlcleanup/ddlcleanuputil.h +++ b/storage/columnstore/columnstore/utils/ddlcleanup/ddlcleanuputil.h @@ -29,6 +29,4 @@ namespace ddlcleanuputil { int ddl_cleanup(); } -// vim:ts=4 sw=4: - #endif diff --git a/storage/columnstore/columnstore/utils/funcexp/func_abs.cpp b/storage/columnstore/columnstore/utils/funcexp/func_abs.cpp index 64ac5d01..cd05ade7 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_abs.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_abs.cpp @@ -79,4 +79,3 @@ long double Func_abs::getLongDoubleVal(Row& row, FunctionParm& parm, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_add_time.cpp b/storage/columnstore/columnstore/utils/funcexp/func_add_time.cpp index 5a2506b3..82c173ed 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_add_time.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_add_time.cpp @@ -303,4 +303,3 @@ int64_t Func_add_time::getTimeIntVal(rowgroup::Row& row, FunctionParm& parm, boo } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_ascii.cpp b/storage/columnstore/columnstore/utils/funcexp/func_ascii.cpp index eb93f601..5cf8653d 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_ascii.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_ascii.cpp @@ -56,4 +56,3 @@ int64_t Func_ascii::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNu } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_between.cpp b/storage/columnstore/columnstore/utils/funcexp/func_between.cpp index 3ce66eb6..65712363 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_between.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_between.cpp @@ -376,4 +376,3 @@ bool Func_notbetween::getBoolVal(rowgroup::Row& row, FunctionParm& pm, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_bitwise.cpp b/storage/columnstore/columnstore/utils/funcexp/func_bitwise.cpp index c10030b9..998696ae 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_bitwise.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_bitwise.cpp @@ -494,4 +494,3 @@ bool Func_bit_count::fix(execplan::FunctionColumn& col) const } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_case.cpp b/storage/columnstore/columnstore/utils/funcexp/func_case.cpp index e8bfbd0f..fba7691e 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_case.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_case.cpp @@ -723,4 +723,3 @@ int64_t Func_searched_case::getTimeIntVal(rowgroup::Row& row, FunctionParm& parm } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_cast.cpp b/storage/columnstore/columnstore/utils/funcexp/func_cast.cpp index 4b224c6d..ef0e2f51 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_cast.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_cast.cpp @@ -1549,4 +1549,3 @@ double Func_cast_double::getDoubleVal(Row& row, FunctionParm& parm, bool& isNull } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_ceil.cpp b/storage/columnstore/columnstore/utils/funcexp/func_ceil.cpp index dc559a5d..e5c1f872 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_ceil.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_ceil.cpp @@ -598,4 +598,3 @@ IDB_Decimal Func_ceil::getDecimalVal(Row& row, FunctionParm& parm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_char.cpp b/storage/columnstore/columnstore/utils/funcexp/func_char.cpp index 7ead2b94..0c4adeaf 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_char.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_char.cpp @@ -178,4 +178,3 @@ string Func_char::getStrVal(Row& row, FunctionParm& parm, bool& isNull, CalpontS } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_char_length.cpp b/storage/columnstore/columnstore/utils/funcexp/func_char_length.cpp index 553d5439..5270d1d8 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_char_length.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_char_length.cpp @@ -121,4 +121,3 @@ int64_t Func_char_length::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_coalesce.cpp b/storage/columnstore/columnstore/utils/funcexp/func_coalesce.cpp index ebabde05..bbb5a279 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_coalesce.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_coalesce.cpp @@ -244,4 +244,3 @@ execplan::IDB_Decimal Func_coalesce::getDecimalVal(rowgroup::Row& row, FunctionP } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_concat.cpp b/storage/columnstore/columnstore/utils/funcexp/func_concat.cpp index 73b2a2b2..05835d23 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_concat.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_concat.cpp @@ -65,4 +65,3 @@ string Func_concat::getStrVal(Row& row, FunctionParm& parm, bool& isNull, Calpon } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_concat_oracle.cpp b/storage/columnstore/columnstore/utils/funcexp/func_concat_oracle.cpp index 28713a10..46631e7a 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_concat_oracle.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_concat_oracle.cpp @@ -71,4 +71,3 @@ string Func_concat_oracle::getStrVal(Row& row, FunctionParm& parm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_concat_ws.cpp b/storage/columnstore/columnstore/utils/funcexp/func_concat_ws.cpp index 2c07c5b0..ea0cf22d 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_concat_ws.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_concat_ws.cpp @@ -121,4 +121,3 @@ string Func_concat_ws::getStrVal(Row& row, FunctionParm& parm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_conv.cpp b/storage/columnstore/columnstore/utils/funcexp/func_conv.cpp index 5f73f5ea..037ce83e 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_conv.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_conv.cpp @@ -304,4 +304,3 @@ string Func_conv::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_convert_tz.cpp b/storage/columnstore/columnstore/utils/funcexp/func_convert_tz.cpp index 03efdad8..36339279 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_convert_tz.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_convert_tz.cpp @@ -220,4 +220,3 @@ string Func_convert_tz::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_crc32.cpp b/storage/columnstore/columnstore/utils/funcexp/func_crc32.cpp index 8d728c11..e573db87 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_crc32.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_crc32.cpp @@ -64,4 +64,3 @@ int64_t Func_crc32::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNu } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_date.cpp b/storage/columnstore/columnstore/utils/funcexp/func_date.cpp index 5544e8b3..b6e554e5 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_date.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_date.cpp @@ -149,4 +149,3 @@ string Func_date::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_date_add.cpp b/storage/columnstore/columnstore/utils/funcexp/func_date_add.cpp index 2e715acc..6cc47fda 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_date_add.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_date_add.cpp @@ -816,4 +816,3 @@ string Func_date_add::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_date_format.cpp b/storage/columnstore/columnstore/utils/funcexp/func_date_format.cpp index 962fc811..8a3ba974 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_date_format.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_date_format.cpp @@ -416,4 +416,3 @@ int64_t Func_date_format::getTimestampIntVal(rowgroup::Row& row, FunctionParm& p } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_day.cpp b/storage/columnstore/columnstore/utils/funcexp/func_day.cpp index bd4a484d..e7954e3d 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_day.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_day.cpp @@ -143,4 +143,3 @@ int64_t Func_day::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_dayname.cpp b/storage/columnstore/columnstore/utils/funcexp/func_dayname.cpp index 07078a25..e8e069db 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_dayname.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_dayname.cpp @@ -179,4 +179,3 @@ string Func_dayname::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_dayofweek.cpp b/storage/columnstore/columnstore/utils/funcexp/func_dayofweek.cpp index 441bfeeb..c8fb40ab 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_dayofweek.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_dayofweek.cpp @@ -166,4 +166,3 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_dayofyear.cpp b/storage/columnstore/columnstore/utils/funcexp/func_dayofyear.cpp index fb9d9742..215ec215 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_dayofyear.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_dayofyear.cpp @@ -160,4 +160,3 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_div.cpp b/storage/columnstore/columnstore/utils/funcexp/func_div.cpp index 7169992b..d36e75c9 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_div.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_div.cpp @@ -108,4 +108,3 @@ string Func_div::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_elt.cpp b/storage/columnstore/columnstore/utils/funcexp/func_elt.cpp index 22446095..860dd1ae 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_elt.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_elt.cpp @@ -96,4 +96,3 @@ string Func_elt::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_exp.cpp b/storage/columnstore/columnstore/utils/funcexp/func_exp.cpp index bab2fc92..d57b2855 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_exp.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_exp.cpp @@ -110,4 +110,3 @@ long double Func_exp::getLongDoubleVal(Row& row, FunctionParm& parm, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_extract.cpp b/storage/columnstore/columnstore/utils/funcexp/func_extract.cpp index a6f8d635..b051f267 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_extract.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_extract.cpp @@ -254,4 +254,3 @@ int64_t Func_extract::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_find_in_set.cpp b/storage/columnstore/columnstore/utils/funcexp/func_find_in_set.cpp index 94c1243d..85b0c7e2 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_find_in_set.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_find_in_set.cpp @@ -127,4 +127,3 @@ execplan::IDB_Decimal Func_find_in_set::getDecimalVal(rowgroup::Row& row, Functi } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_floor.cpp b/storage/columnstore/columnstore/utils/funcexp/func_floor.cpp index 7c0dacc8..f497400b 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_floor.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_floor.cpp @@ -555,4 +555,3 @@ IDB_Decimal Func_floor::getDecimalVal(Row& row, FunctionParm& parm, bool& isNull } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_from_days.cpp b/storage/columnstore/columnstore/utils/funcexp/func_from_days.cpp index e9f45b42..a3e964ee 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_from_days.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_from_days.cpp @@ -80,4 +80,3 @@ int64_t Func_from_days::getDatetimeIntVal(rowgroup::Row& row, FunctionParm& parm } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_from_unixtime.cpp b/storage/columnstore/columnstore/utils/funcexp/func_from_unixtime.cpp index cca4083b..b01bfab3 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_from_unixtime.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_from_unixtime.cpp @@ -212,4 +212,3 @@ long double Func_from_unixtime::getLongDoubleVal(rowgroup::Row& row, FunctionPar } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_get_format.cpp b/storage/columnstore/columnstore/utils/funcexp/func_get_format.cpp index d902c087..00f51364 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_get_format.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_get_format.cpp @@ -107,4 +107,3 @@ string Func_get_format::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_greatest.cpp b/storage/columnstore/columnstore/utils/funcexp/func_greatest.cpp index e8562be2..b3dea5be 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_greatest.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_greatest.cpp @@ -240,4 +240,3 @@ int64_t Func_greatest::getTimeIntVal(rowgroup::Row& row, FunctionParm& fp, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_hex.cpp b/storage/columnstore/columnstore/utils/funcexp/func_hex.cpp index 9e2fa114..c1a111cb 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_hex.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_hex.cpp @@ -140,4 +140,3 @@ string Func_hex::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_hour.cpp b/storage/columnstore/columnstore/utils/funcexp/func_hour.cpp index 7d2da741..0550ef3e 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_hour.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_hour.cpp @@ -156,4 +156,3 @@ int64_t Func_hour::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_idbpartition.cpp b/storage/columnstore/columnstore/utils/funcexp/func_idbpartition.cpp index 3b71cdd9..b7b5e697 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_idbpartition.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_idbpartition.cpp @@ -63,4 +63,3 @@ string Func_idbpartition::getStrVal(Row& row, FunctionParm& parm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_if.cpp b/storage/columnstore/columnstore/utils/funcexp/func_if.cpp index 98fe8a33..d5941df8 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_if.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_if.cpp @@ -234,4 +234,3 @@ int64_t Func_if::getTimeIntVal(Row& row, FunctionParm& parm, bool& isNull, Calpo } } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_ifnull.cpp b/storage/columnstore/columnstore/utils/funcexp/func_ifnull.cpp index 52dae255..a2450a5a 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_ifnull.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_ifnull.cpp @@ -205,4 +205,3 @@ bool Func_ifnull::getBoolVal(Row& row, FunctionParm& parm, bool& isNull, Calpont } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_in.cpp b/storage/columnstore/columnstore/utils/funcexp/func_in.cpp index 89ed8959..d452fc24 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_in.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_in.cpp @@ -386,4 +386,3 @@ bool Func_notin::getBoolVal(rowgroup::Row& row, FunctionParm& pm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_insert.cpp b/storage/columnstore/columnstore/utils/funcexp/func_insert.cpp index 236752e9..72fd06e4 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_insert.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_insert.cpp @@ -102,4 +102,3 @@ std::string Func_insert::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& i } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_instr.cpp b/storage/columnstore/columnstore/utils/funcexp/func_instr.cpp index ab0379cc..71eb81d0 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_instr.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_instr.cpp @@ -85,4 +85,3 @@ int64_t Func_instr::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNu } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_isnull.cpp b/storage/columnstore/columnstore/utils/funcexp/func_isnull.cpp index 48337b3e..4ff7e643 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_isnull.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_isnull.cpp @@ -79,4 +79,3 @@ bool Func_isnull::getBoolVal(Row& row, FunctionParm& parm, bool& isNull, Calpont } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_last_day.cpp b/storage/columnstore/columnstore/utils/funcexp/func_last_day.cpp index 89f173a7..e74a2d51 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_last_day.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_last_day.cpp @@ -195,4 +195,3 @@ int64_t Func_last_day::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& i } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_lcase.cpp b/storage/columnstore/columnstore/utils/funcexp/func_lcase.cpp index 817e82ae..eabdfd40 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_lcase.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_lcase.cpp @@ -68,4 +68,3 @@ std::string Func_lcase::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_least.cpp b/storage/columnstore/columnstore/utils/funcexp/func_least.cpp index add78cfa..d488b751 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_least.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_least.cpp @@ -218,4 +218,3 @@ int64_t Func_least::getTimeIntVal(rowgroup::Row& row, FunctionParm& fp, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_left.cpp b/storage/columnstore/columnstore/utils/funcexp/func_left.cpp index a90d5f46..de31d177 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_left.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_left.cpp @@ -73,4 +73,3 @@ std::string Func_left::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_length.cpp b/storage/columnstore/columnstore/utils/funcexp/func_length.cpp index f63e2f1b..a6f7236f 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_length.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_length.cpp @@ -55,4 +55,3 @@ int64_t Func_length::getIntVal(rowgroup::Row& row, FunctionParm& fp, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_lpad.cpp b/storage/columnstore/columnstore/utils/funcexp/func_lpad.cpp index 0ad0bdc2..8a5544a6 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_lpad.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_lpad.cpp @@ -127,4 +127,3 @@ std::string Func_lpad::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_ltrim.cpp b/storage/columnstore/columnstore/utils/funcexp/func_ltrim.cpp index 39fd7165..3d7e9691 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_ltrim.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_ltrim.cpp @@ -93,4 +93,3 @@ std::string Func_ltrim::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_ltrim_oracle.cpp b/storage/columnstore/columnstore/utils/funcexp/func_ltrim_oracle.cpp index 234808e7..70fc1dc8 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_ltrim_oracle.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_ltrim_oracle.cpp @@ -97,4 +97,3 @@ std::string Func_ltrim_oracle::getStrVal(rowgroup::Row& row, FunctionParm& fp, b } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_makedate.cpp b/storage/columnstore/columnstore/utils/funcexp/func_makedate.cpp index 0418508d..fb49f54c 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_makedate.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_makedate.cpp @@ -190,4 +190,3 @@ string Func_makedate::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_maketime.cpp b/storage/columnstore/columnstore/utils/funcexp/func_maketime.cpp index 6d0a9d90..ad918ccc 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_maketime.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_maketime.cpp @@ -171,4 +171,3 @@ string Func_maketime::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_math.cpp b/storage/columnstore/columnstore/utils/funcexp/func_math.cpp index 7d60ae50..74a12aa7 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_math.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_math.cpp @@ -2276,4 +2276,3 @@ double Func_degrees::getDoubleVal(Row& row, FunctionParm& parm, bool& isNull, Ca } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_md5.cpp b/storage/columnstore/columnstore/utils/funcexp/func_md5.cpp index 6ef058e8..0ce6b0a0 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_md5.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_md5.cpp @@ -512,4 +512,3 @@ string Func_md5::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull, } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_microsecond.cpp b/storage/columnstore/columnstore/utils/funcexp/func_microsecond.cpp index aca1e3ae..8c94647b 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_microsecond.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_microsecond.cpp @@ -137,4 +137,3 @@ int64_t Func_microsecond::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_minute.cpp b/storage/columnstore/columnstore/utils/funcexp/func_minute.cpp index af310c87..8e572454 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_minute.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_minute.cpp @@ -137,4 +137,3 @@ int64_t Func_minute::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_mod.cpp b/storage/columnstore/columnstore/utils/funcexp/func_mod.cpp index bf33a649..dff1a4e0 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_mod.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_mod.cpp @@ -531,4 +531,3 @@ std::string Func_mod::getStrVal(Row& row, FunctionParm& fp, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_month.cpp b/storage/columnstore/columnstore/utils/funcexp/func_month.cpp index 50ee3600..ea66abf3 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_month.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_month.cpp @@ -142,4 +142,3 @@ int64_t Func_month::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNu } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_monthname.cpp b/storage/columnstore/columnstore/utils/funcexp/func_monthname.cpp index 8ea7c3e3..c674f454 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_monthname.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_monthname.cpp @@ -191,4 +191,3 @@ execplan::IDB_Decimal Func_monthname::getDecimalVal(rowgroup::Row& row, Function } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_nullif.cpp b/storage/columnstore/columnstore/utils/funcexp/func_nullif.cpp index ba4ab740..3821151e 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_nullif.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_nullif.cpp @@ -964,7 +964,7 @@ execplan::IDB_Decimal Func_nullif::getDecimalVal(rowgroup::Row& row, FunctionPar { // strip off micro seconds value = value.substr(0, 14); - int64_t x = atoll(value.c_str()); + x = atoll(value.c_str()); if (s > 5) s = 0; @@ -1022,4 +1022,3 @@ execplan::IDB_Decimal Func_nullif::getDecimalVal(rowgroup::Row& row, FunctionPar } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_period_add.cpp b/storage/columnstore/columnstore/utils/funcexp/func_period_add.cpp index 23b96415..4038651e 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_period_add.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_period_add.cpp @@ -94,4 +94,3 @@ int64_t Func_period_add::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_period_diff.cpp b/storage/columnstore/columnstore/utils/funcexp/func_period_diff.cpp index 470ab60c..080d15a4 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_period_diff.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_period_diff.cpp @@ -113,4 +113,3 @@ int64_t Func_period_diff::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_pow.cpp b/storage/columnstore/columnstore/utils/funcexp/func_pow.cpp index 734b50a2..236e7e2c 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_pow.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_pow.cpp @@ -121,4 +121,3 @@ long double Func_pow::getLongDoubleVal(Row& row, FunctionParm& parm, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_quarter.cpp b/storage/columnstore/columnstore/utils/funcexp/func_quarter.cpp index 04c4babb..5f1fd003 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_quarter.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_quarter.cpp @@ -139,4 +139,3 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_quote.cpp b/storage/columnstore/columnstore/utils/funcexp/func_quote.cpp index 05ce4cec..b82cf7ba 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_quote.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_quote.cpp @@ -80,4 +80,3 @@ std::string Func_quote::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_rand.cpp b/storage/columnstore/columnstore/utils/funcexp/func_rand.cpp index 223949bb..b7da263d 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_rand.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_rand.cpp @@ -98,4 +98,3 @@ double Func_rand::getDoubleVal(rowgroup::Row& row, FunctionParm& parm, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_regexp.cpp b/storage/columnstore/columnstore/utils/funcexp/func_regexp.cpp index cb495c8c..60e1459d 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_regexp.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_regexp.cpp @@ -248,4 +248,3 @@ bool Func_regexp::getBoolVal(rowgroup::Row& row, FunctionParm& pm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_repeat.cpp b/storage/columnstore/columnstore/utils/funcexp/func_repeat.cpp index 6b0e6ace..ebbfc355 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_repeat.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_repeat.cpp @@ -90,4 +90,3 @@ std::string Func_repeat::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& i } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_replace.cpp b/storage/columnstore/columnstore/utils/funcexp/func_replace.cpp index 05e0fe35..da18fb3f 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_replace.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_replace.cpp @@ -173,4 +173,3 @@ std::string Func_replace::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_replace_oracle.cpp b/storage/columnstore/columnstore/utils/funcexp/func_replace_oracle.cpp index b8eb7f6e..113b49d9 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_replace_oracle.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_replace_oracle.cpp @@ -167,4 +167,3 @@ std::string Func_replace_oracle::getStrVal(rowgroup::Row& row, FunctionParm& fp, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_reverse.cpp b/storage/columnstore/columnstore/utils/funcexp/func_reverse.cpp index 2b383ee7..db57d095 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_reverse.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_reverse.cpp @@ -93,4 +93,3 @@ std::string Func_reverse::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_right.cpp b/storage/columnstore/columnstore/utils/funcexp/func_right.cpp index 4615256e..2c1ec612 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_right.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_right.cpp @@ -73,4 +73,3 @@ std::string Func_right::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_round.cpp b/storage/columnstore/columnstore/utils/funcexp/func_round.cpp index 16855324..c6e67336 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_round.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_round.cpp @@ -645,7 +645,7 @@ string Func_round::getStrVal(Row& row, FunctionParm& parm, bool& isNull, Calpont { IDB_Decimal x = getDecimalVal(row, parm, isNull, op_ct); int64_t e = (x.scale < 0) ? (-x.scale) : x.scale; - int64_t p = 1; + [[maybe_unused]] int64_t p = 1; while (e-- > 0) p *= 10; @@ -716,4 +716,3 @@ int64_t Func_round::getTimestampIntVal(rowgroup::Row& row, FunctionParm& parm, b } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_rpad.cpp b/storage/columnstore/columnstore/utils/funcexp/func_rpad.cpp index fba47bfa..a2a538ff 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_rpad.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_rpad.cpp @@ -127,4 +127,3 @@ std::string Func_rpad::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_rtrim.cpp b/storage/columnstore/columnstore/utils/funcexp/func_rtrim.cpp index 426ec871..ee61906b 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_rtrim.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_rtrim.cpp @@ -157,4 +157,3 @@ std::string Func_rtrim::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_rtrim_oracle.cpp b/storage/columnstore/columnstore/utils/funcexp/func_rtrim_oracle.cpp index 1b47d7dd..93713e11 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_rtrim_oracle.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_rtrim_oracle.cpp @@ -161,4 +161,3 @@ std::string Func_rtrim_oracle::getStrVal(rowgroup::Row& row, FunctionParm& fp, b } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_sec_to_time.cpp b/storage/columnstore/columnstore/utils/funcexp/func_sec_to_time.cpp index d3b4af67..9a2fef4c 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_sec_to_time.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_sec_to_time.cpp @@ -231,4 +231,3 @@ execplan::IDB_Decimal Func_sec_to_time::getDecimalVal(rowgroup::Row& row, Functi } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_second.cpp b/storage/columnstore/columnstore/utils/funcexp/func_second.cpp index 7731ea66..6136c3ed 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_second.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_second.cpp @@ -144,4 +144,3 @@ int64_t Func_second::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_sha.cpp b/storage/columnstore/columnstore/utils/funcexp/func_sha.cpp index bc74a0a2..ec3fac1f 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_sha.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_sha.cpp @@ -655,4 +655,3 @@ string Func_sha::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull, } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_sign.cpp b/storage/columnstore/columnstore/utils/funcexp/func_sign.cpp index a0cece67..426fbb0c 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_sign.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_sign.cpp @@ -71,4 +71,3 @@ string Func_sign::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_space.cpp b/storage/columnstore/columnstore/utils/funcexp/func_space.cpp index 93e765a5..9a9a8578 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_space.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_space.cpp @@ -57,4 +57,3 @@ std::string Func_space::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_str_to_date.cpp b/storage/columnstore/columnstore/utils/funcexp/func_str_to_date.cpp index 0580021f..ab0fb4f6 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_str_to_date.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_str_to_date.cpp @@ -264,4 +264,3 @@ int64_t Func_str_to_date::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_strcmp.cpp b/storage/columnstore/columnstore/utils/funcexp/func_strcmp.cpp index a16c68cc..63b3b0b2 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_strcmp.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_strcmp.cpp @@ -74,4 +74,3 @@ std::string Func_strcmp::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& i } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_substr.cpp b/storage/columnstore/columnstore/utils/funcexp/func_substr.cpp index cb45acc0..9a39a4f1 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_substr.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_substr.cpp @@ -98,4 +98,3 @@ std::string Func_substr::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& i } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_substring_index.cpp b/storage/columnstore/columnstore/utils/funcexp/func_substring_index.cpp index ffae25e5..82f94a7e 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_substring_index.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_substring_index.cpp @@ -205,4 +205,3 @@ std::string Func_substring_index::getStrVal(rowgroup::Row& row, FunctionParm& fp } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_sysdate.cpp b/storage/columnstore/columnstore/utils/funcexp/func_sysdate.cpp index b30e66c5..780492f3 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_sysdate.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_sysdate.cpp @@ -105,4 +105,3 @@ int64_t Func_sysdate::getTimeIntVal(rowgroup::Row& row, FunctionParm& parm, bool } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_time.cpp b/storage/columnstore/columnstore/utils/funcexp/func_time.cpp index 14d2246a..e898f782 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_time.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_time.cpp @@ -169,4 +169,3 @@ double Func_time::getDoubleVal(rowgroup::Row& row, FunctionParm& fp, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_time_format.cpp b/storage/columnstore/columnstore/utils/funcexp/func_time_format.cpp index d075658b..1205e21b 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_time_format.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_time_format.cpp @@ -229,4 +229,3 @@ string Func_time_format::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_time_to_sec.cpp b/storage/columnstore/columnstore/utils/funcexp/func_time_to_sec.cpp index 388ef2ca..3cf718aa 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_time_to_sec.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_time_to_sec.cpp @@ -195,4 +195,3 @@ int64_t Func_time_to_sec::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_timediff.cpp b/storage/columnstore/columnstore/utils/funcexp/func_timediff.cpp index d3f89139..03000476 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_timediff.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_timediff.cpp @@ -349,4 +349,3 @@ double Func_timediff::getDoubleVal(rowgroup::Row& row, FunctionParm& fp, bool& i } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_timestampdiff.cpp b/storage/columnstore/columnstore/utils/funcexp/func_timestampdiff.cpp index 07e7eda7..6ad2f395 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_timestampdiff.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_timestampdiff.cpp @@ -196,4 +196,3 @@ int64_t Func_timestampdiff::getTimeIntVal(rowgroup::Row& row, FunctionParm& parm } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_to_days.cpp b/storage/columnstore/columnstore/utils/funcexp/func_to_days.cpp index f597c5fd..d6f831be 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_to_days.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_to_days.cpp @@ -151,4 +151,3 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_trim.cpp b/storage/columnstore/columnstore/utils/funcexp/func_trim.cpp index 636afe44..d4782356 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_trim.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_trim.cpp @@ -168,4 +168,3 @@ std::string Func_trim::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& isN } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_trim_oracle.cpp b/storage/columnstore/columnstore/utils/funcexp/func_trim_oracle.cpp index 5e1226c5..4daec213 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_trim_oracle.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_trim_oracle.cpp @@ -166,4 +166,3 @@ std::string Func_trim_oracle::getStrVal(rowgroup::Row& row, FunctionParm& fp, bo } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_truncate.cpp b/storage/columnstore/columnstore/utils/funcexp/func_truncate.cpp index 87f045af..7a529c00 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_truncate.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_truncate.cpp @@ -522,7 +522,7 @@ IDB_Decimal Func_truncate::getDecimalVal(Row& row, FunctionParm& parm, bool& isN { // strip off micro seconds value = value.substr(0, 14); - int64_t x = atoll(value.c_str()); + x = atoll(value.c_str()); if (s > 5) s = 0; @@ -613,7 +613,7 @@ IDB_Decimal Func_truncate::getDecimalVal(Row& row, FunctionParm& parm, bool& isN { // strip off micro seconds value = value.substr(0, 14); - int64_t x = atoll(value.c_str()); + x = atoll(value.c_str()); if (s > 5) s = 0; @@ -721,4 +721,3 @@ int64_t Func_truncate::getTimestampIntVal(rowgroup::Row& row, FunctionParm& parm } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_ucase.cpp b/storage/columnstore/columnstore/utils/funcexp/func_ucase.cpp index 9fa00e67..1cbbd6a2 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_ucase.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_ucase.cpp @@ -77,4 +77,3 @@ std::string Func_ucase::getStrVal(rowgroup::Row& row, FunctionParm& fp, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_unhex.cpp b/storage/columnstore/columnstore/utils/funcexp/func_unhex.cpp index 38da2cb2..92ef5fa3 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_unhex.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_unhex.cpp @@ -112,4 +112,3 @@ string Func_unhex::getStrVal(rowgroup::Row& row, FunctionParm& parm, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_unix_timestamp.cpp b/storage/columnstore/columnstore/utils/funcexp/func_unix_timestamp.cpp index d5b65fe2..f9c81e6b 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_unix_timestamp.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_unix_timestamp.cpp @@ -223,4 +223,3 @@ string Func_unix_timestamp::getStrVal(rowgroup::Row& row, FunctionParm& parm, bo } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_week.cpp b/storage/columnstore/columnstore/utils/funcexp/func_week.cpp index 8f7a3af0..e6ab52f3 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_week.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_week.cpp @@ -169,4 +169,3 @@ int64_t Func_week::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_weekday.cpp b/storage/columnstore/columnstore/utils/funcexp/func_weekday.cpp index 302293b8..e78d12c6 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_weekday.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_weekday.cpp @@ -164,4 +164,3 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& is } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_year.cpp b/storage/columnstore/columnstore/utils/funcexp/func_year.cpp index 2f4fc827..9ea12fbd 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_year.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_year.cpp @@ -140,4 +140,3 @@ int64_t Func_year::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNul } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/func_yearweek.cpp b/storage/columnstore/columnstore/utils/funcexp/func_yearweek.cpp index 3b85692b..2ad94139 100644 --- a/storage/columnstore/columnstore/utils/funcexp/func_yearweek.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/func_yearweek.cpp @@ -173,4 +173,3 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& i } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/funcexp/functor.cpp b/storage/columnstore/columnstore/utils/funcexp/functor.cpp index 4eed1688..3da34944 100644 --- a/storage/columnstore/columnstore/utils/funcexp/functor.cpp +++ b/storage/columnstore/columnstore/utils/funcexp/functor.cpp @@ -361,4 +361,3 @@ string Func::longDoubleToString(long double ld) } } // namespace funcexp -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/libmysql_client/libmysql_client.h b/storage/columnstore/columnstore/utils/libmysql_client/libmysql_client.h index 4207a705..931886b7 100644 --- a/storage/columnstore/columnstore/utils/libmysql_client/libmysql_client.h +++ b/storage/columnstore/columnstore/utils/libmysql_client/libmysql_client.h @@ -91,4 +91,3 @@ class LibMySQL #endif // UTILS_LIBMYSQL_CL_H -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/loggingcpp/errorcodes.cpp b/storage/columnstore/columnstore/utils/loggingcpp/errorcodes.cpp index e52a5e32..c8e879c0 100644 --- a/storage/columnstore/columnstore/utils/loggingcpp/errorcodes.cpp +++ b/storage/columnstore/columnstore/utils/loggingcpp/errorcodes.cpp @@ -103,4 +103,3 @@ string ErrorCodes::errorString(uint16_t code) const return (fPreamble + msg); } } // namespace logging -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/loggingcpp/exceptclasses.h b/storage/columnstore/columnstore/utils/loggingcpp/exceptclasses.h index 92aebbbb..7bd6b625 100644 --- a/storage/columnstore/columnstore/utils/loggingcpp/exceptclasses.h +++ b/storage/columnstore/columnstore/utils/loggingcpp/exceptclasses.h @@ -307,5 +307,4 @@ class ProtocolError : public std::logic_error } // namespace logging -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/messageqcpp/inetstreamsocket.cpp b/storage/columnstore/columnstore/utils/messageqcpp/inetstreamsocket.cpp index 81ed82f6..45f605bc 100644 --- a/storage/columnstore/columnstore/utils/messageqcpp/inetstreamsocket.cpp +++ b/storage/columnstore/columnstore/utils/messageqcpp/inetstreamsocket.cpp @@ -101,8 +101,6 @@ using boost::scoped_array; // some static functions namespace { -using messageqcpp::ByteStream; - // @bug 2441 - Retry after 512 read() error. // ERESTARTSYS (512) is a kernal I/O errno that is similar to a EINTR, except // that it is not supposed to "leak" out into the user space. But we are @@ -937,16 +935,8 @@ void InetStreamSocket::connect(const sockaddr* serv_addr) char buf = '\0'; (void)::recv(socketParms().sd(), &buf, 1, 0); #else -#if defined(__GNUC__) && __GNUC__ >= 5 -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wunused-result" - char buf = '\0'; - ::read(socketParms().sd(), &buf, 1); // we know 1 byte is in the recv buffer -#pragma GCC diagnostic pop -#else char buf = '\0'; - ::read(socketParms().sd(), &buf, 1); // we know 1 byte is in the recv buffer -#endif // pragma + std::ignore = ::read(socketParms().sd(), &buf, 1); // we know 1 byte is in the recv buffer #endif return; } diff --git a/storage/columnstore/columnstore/utils/messageqcpp/messagequeue.h b/storage/columnstore/columnstore/utils/messageqcpp/messagequeue.h index 7d9cba82..30dd20ff 100644 --- a/storage/columnstore/columnstore/utils/messageqcpp/messagequeue.h +++ b/storage/columnstore/columnstore/utils/messageqcpp/messagequeue.h @@ -337,5 +337,4 @@ inline void MessageQueueClient::syncProto(bool use) #undef EXPORT -#endif // MESSAGEQCPP_MESSAGEQUEUE_H -// vim:ts=4 sw=4: +#endif // MESSAGEQCPP_MESSAGEQUEUE_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/multicast/multicast.cpp b/storage/columnstore/columnstore/utils/multicast/multicast.cpp index 116f0382..b471c170 100644 --- a/storage/columnstore/columnstore/utils/multicast/multicast.cpp +++ b/storage/columnstore/columnstore/utils/multicast/multicast.cpp @@ -93,4 +93,3 @@ void MulticastSender::send(const ByteStream& msg) } // namespace multicast -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/regr/regrmysql.cpp b/storage/columnstore/columnstore/utils/regr/regrmysql.cpp index 1b480aa8..d9e9a51b 100644 --- a/storage/columnstore/columnstore/utils/regr/regrmysql.cpp +++ b/storage/columnstore/columnstore/utils/regr/regrmysql.cpp @@ -1405,4 +1405,3 @@ extern "C" return valOut; } } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/rowgroup/rowgroup.cpp b/storage/columnstore/columnstore/utils/rowgroup/rowgroup.cpp index 4e767e1d..7c297f8f 100644 --- a/storage/columnstore/columnstore/utils/rowgroup/rowgroup.cpp +++ b/storage/columnstore/columnstore/utils/rowgroup/rowgroup.cpp @@ -1751,4 +1751,3 @@ RowGroup RowGroup::truncate(uint32_t cols) } // namespace rowgroup -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/rowgroup/rowgroup.h b/storage/columnstore/columnstore/utils/rowgroup/rowgroup.h index a17449d0..6dfebfec 100644 --- a/storage/columnstore/columnstore/utils/rowgroup/rowgroup.h +++ b/storage/columnstore/columnstore/utils/rowgroup/rowgroup.h @@ -31,7 +31,7 @@ #include <vector> #include <string> #include <stdexcept> -//#define NDEBUG +// #define NDEBUG #include <cassert> #include <boost/shared_ptr.hpp> #include <boost/shared_array.hpp> @@ -1525,8 +1525,8 @@ class RowGroup : public messageqcpp::Serializeable inline void setUseStringTable(bool); // RGData *convertToInlineData(uint64_t *size = NULL) const; // caller manages the memory returned by - //this void convertToInlineDataInPlace(); RGData *convertToStringTable(uint64_t *size = NULL) const; void - //convertToStringTableInPlace(); + // this void convertToInlineDataInPlace(); RGData *convertToStringTable(uint64_t *size = NULL) + // const; void convertToStringTableInPlace(); void serializeRGData(messageqcpp::ByteStream&) const; inline uint32_t getStringTableThreshold() const; @@ -2184,5 +2184,4 @@ inline void RGData::getRow(uint32_t num, Row* row) } // namespace rowgroup -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/rwlock/rwlock.cpp b/storage/columnstore/columnstore/utils/rwlock/rwlock.cpp index 73a9c5db..ca7b82e9 100644 --- a/storage/columnstore/columnstore/utils/rwlock/rwlock.cpp +++ b/storage/columnstore/columnstore/utils/rwlock/rwlock.cpp @@ -746,4 +746,3 @@ LockState RWLock::getLockState() } } // namespace rwlock -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/rwlock/rwlock.h b/storage/columnstore/columnstore/utils/rwlock/rwlock.h index 33702570..d18640a4 100644 --- a/storage/columnstore/columnstore/utils/rwlock/rwlock.h +++ b/storage/columnstore/columnstore/utils/rwlock/rwlock.h @@ -46,9 +46,15 @@ namespace rwlock { -const std::array<const std::string, 7> RWLockNames = { { - "all", "VSS", "ExtentMap", "FreeList", "VBBM", "CopyLocks", "ExtentMapIndex", -} }; +const std::array<const std::string, 7> RWLockNames = {{ + "all", + "VSS", + "ExtentMap", + "FreeList", + "VBBM", + "CopyLocks", + "ExtentMapIndex", +}}; /// the layout of the shmseg struct State @@ -283,5 +289,4 @@ class RWLock #undef EXPORT -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/startup/installdir.cpp b/storage/columnstore/columnstore/utils/startup/installdir.cpp index 65437a9c..2db2128d 100644 --- a/storage/columnstore/columnstore/utils/startup/installdir.cpp +++ b/storage/columnstore/columnstore/utils/startup/installdir.cpp @@ -112,4 +112,3 @@ const string StartUp::tmpDir() } } // namespace startup -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/startup/installdir.h b/storage/columnstore/columnstore/utils/startup/installdir.h index 4d9b8989..c902d4bf 100644 --- a/storage/columnstore/columnstore/utils/startup/installdir.h +++ b/storage/columnstore/columnstore/utils/startup/installdir.h @@ -53,5 +53,4 @@ class StartUp } // namespace startup -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/testbc/iomanager.cpp b/storage/columnstore/columnstore/utils/testbc/iomanager.cpp index 7c3cc4d6..b2944e5b 100644 --- a/storage/columnstore/columnstore/utils/testbc/iomanager.cpp +++ b/storage/columnstore/columnstore/utils/testbc/iomanager.cpp @@ -325,4 +325,3 @@ fileRequest* ioManager::getNextRequest() } } // namespace dbbc -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/testbc/iomanager.h b/storage/columnstore/columnstore/utils/testbc/iomanager.h index 20704c58..aab251dd 100644 --- a/storage/columnstore/columnstore/utils/testbc/iomanager.h +++ b/storage/columnstore/columnstore/utils/testbc/iomanager.h @@ -99,5 +99,4 @@ class ioManager }; } // namespace dbbc -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/threadpool/prioritythreadpool.cpp b/storage/columnstore/columnstore/utils/threadpool/prioritythreadpool.cpp index b26144b6..908c0ba9 100644 --- a/storage/columnstore/columnstore/utils/threadpool/prioritythreadpool.cpp +++ b/storage/columnstore/columnstore/utils/threadpool/prioritythreadpool.cpp @@ -322,4 +322,3 @@ void PriorityThreadPool::stop() } } // namespace threadpool -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/udfsdk/udfmysql.cpp b/storage/columnstore/columnstore/utils/udfsdk/udfmysql.cpp index 55272942..f32fc6b3 100644 --- a/storage/columnstore/columnstore/utils/udfsdk/udfmysql.cpp +++ b/storage/columnstore/columnstore/utils/udfsdk/udfmysql.cpp @@ -535,4 +535,3 @@ extern "C" return 0; } } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/udfsdk/udfsdk.cpp b/storage/columnstore/columnstore/utils/udfsdk/udfsdk.cpp index 0cf80618..dc5e4fa8 100644 --- a/storage/columnstore/columnstore/utils/udfsdk/udfsdk.cpp +++ b/storage/columnstore/columnstore/utils/udfsdk/udfsdk.cpp @@ -375,4 +375,3 @@ int64_t MCS_isnull::getDatetimeIntVal(Row& row, FunctionParm& parm, bool& isNull } } // namespace udfsdk -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/udfsdk/udfsdk.h b/storage/columnstore/columnstore/utils/udfsdk/udfsdk.h index 9e53601b..6c0ee013 100644 --- a/storage/columnstore/columnstore/utils/udfsdk/udfsdk.h +++ b/storage/columnstore/columnstore/utils/udfsdk/udfsdk.h @@ -314,4 +314,3 @@ class MCS_isnull : public funcexp::Func #undef EXPORT -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/framebound.cpp b/storage/columnstore/columnstore/utils/windowfunction/framebound.cpp index 043620f5..56b50d2e 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/framebound.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/framebound.cpp @@ -72,4 +72,3 @@ const string FrameBound::toString() const } } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/framebound.h b/storage/columnstore/columnstore/utils/windowfunction/framebound.h index 27038ae1..22203c73 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/framebound.h +++ b/storage/columnstore/columnstore/utils/windowfunction/framebound.h @@ -146,6 +146,4 @@ extern std::map<int, std::string> colType2String; } // namespace windowfunction -#endif // UTILS_FRAMEBOUND_H - -// vim:ts=4 sw=4: +#endif // UTILS_FRAMEBOUND_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/windowfunction/frameboundrange.cpp b/storage/columnstore/columnstore/utils/windowfunction/frameboundrange.cpp index 0b356bce..e884d930 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/frameboundrange.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/frameboundrange.cpp @@ -411,4 +411,3 @@ template class FrameBoundExpressionRange<float>; template class FrameBoundExpressionRange<uint64_t>; } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/frameboundrange.h b/storage/columnstore/columnstore/utils/windowfunction/frameboundrange.h index 0a36a543..0688e7da 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/frameboundrange.h +++ b/storage/columnstore/columnstore/utils/windowfunction/frameboundrange.h @@ -214,6 +214,4 @@ class FrameBoundExpressionRange : public FrameBoundConstantRange<T> } // namespace windowfunction -#endif // UTILS_FRAMEBOUNDRANGE_H - -// vim:ts=4 sw=4: +#endif // UTILS_FRAMEBOUNDRANGE_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/windowfunction/frameboundrow.cpp b/storage/columnstore/columnstore/utils/windowfunction/frameboundrow.cpp index 616b1e0e..3d442741 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/frameboundrow.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/frameboundrow.cpp @@ -139,4 +139,3 @@ template class FrameBoundExpressionRow<float>; template class FrameBoundExpressionRow<uint64_t>; } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/frameboundrow.h b/storage/columnstore/columnstore/utils/windowfunction/frameboundrow.h index ac0b6c0a..bc7f450a 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/frameboundrow.h +++ b/storage/columnstore/columnstore/utils/windowfunction/frameboundrow.h @@ -148,5 +148,3 @@ class FrameBoundExpressionRow : public FrameBoundConstantRow } // namespace windowfunction #endif // UTILS_FRAMEBOUNDROW_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/idborderby.cpp b/storage/columnstore/columnstore/utils/windowfunction/idborderby.cpp index 30d442e7..5160eed2 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/idborderby.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/idborderby.cpp @@ -898,4 +898,3 @@ bool IdbOrderBy::Eq::operator()(const Row::Pointer& d1, const Row::Pointer& d2) } } // namespace ordering -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_count.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_count.cpp index c45cd297..bc469476 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_count.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_count.cpp @@ -184,4 +184,3 @@ template boost::shared_ptr<WindowFunctionType> WF_count<int64_t>::makeFunction(i WindowFunctionColumn*); } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_count.h b/storage/columnstore/columnstore/utils/windowfunction/wf_count.h index 2dcbd963..1c4da82e 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_count.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_count.h @@ -49,5 +49,3 @@ class WF_count : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_COUNT_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_lead_lag.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_lead_lag.cpp index 4e7de53f..b3babe8b 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_lead_lag.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_lead_lag.cpp @@ -306,4 +306,3 @@ template void WF_lead_lag<double>::parseParms(const std::vector<execplan::SRCP>& template void WF_lead_lag<string>::parseParms(const std::vector<execplan::SRCP>&); } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_lead_lag.h b/storage/columnstore/columnstore/utils/windowfunction/wf_lead_lag.h index 9aaea0c8..e6290eb8 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_lead_lag.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_lead_lag.h @@ -54,5 +54,3 @@ class WF_lead_lag : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_LEAD_LAG_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_min_max.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_min_max.cpp index 4120fe32..b5b63bde 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_min_max.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_min_max.cpp @@ -185,4 +185,3 @@ template boost::shared_ptr<WindowFunctionType> WF_min_max<int64_t>::makeFunction WindowFunctionColumn*); } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_min_max.h b/storage/columnstore/columnstore/utils/windowfunction/wf_min_max.h index bd8091ed..9305ebcb 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_min_max.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_min_max.h @@ -48,5 +48,3 @@ class WF_min_max : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_MIN_MAX_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_nth_value.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_nth_value.cpp index 338984a0..f3c9e2a1 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_nth_value.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_nth_value.cpp @@ -271,4 +271,3 @@ template boost::shared_ptr<WindowFunctionType> WF_nth_value<int64_t>::makeFuncti WindowFunctionColumn*); } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_nth_value.h b/storage/columnstore/columnstore/utils/windowfunction/wf_nth_value.h index d5d98b4b..e78709f2 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_nth_value.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_nth_value.h @@ -52,5 +52,3 @@ class WF_nth_value : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_NTH_VALUE_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_ntile.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_ntile.cpp index 375fd81d..4b663460 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_ntile.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_ntile.cpp @@ -154,4 +154,3 @@ void WF_ntile::operator()(int64_t b, int64_t e, int64_t c) } } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_ntile.h b/storage/columnstore/columnstore/utils/windowfunction/wf_ntile.h index 154f725b..db3de2cf 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_ntile.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_ntile.h @@ -49,5 +49,3 @@ class WF_ntile : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_NTILE_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_percentile.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_percentile.cpp index 4d0dfce0..24d6b9f2 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_percentile.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_percentile.cpp @@ -382,4 +382,3 @@ template boost::shared_ptr<WindowFunctionType> WF_percentile<int64_t>::makeFunct WindowFunctionColumn*); } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_percentile.h b/storage/columnstore/columnstore/utils/windowfunction/wf_percentile.h index 952f29af..713a2698 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_percentile.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_percentile.h @@ -50,5 +50,3 @@ class WF_percentile : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_PERCENTILE_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_ranking.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_ranking.cpp index f0459b7f..540ca808 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_ranking.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_ranking.cpp @@ -145,4 +145,3 @@ void WF_ranking::operator()(int64_t b, int64_t e, int64_t c) } } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_ranking.h b/storage/columnstore/columnstore/utils/windowfunction/wf_ranking.h index df2e7471..dcfb9448 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_ranking.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_ranking.h @@ -48,5 +48,3 @@ class WF_ranking : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_RANKING_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_row_number.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_row_number.cpp index 6453c0a0..6dd58ce3 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_row_number.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_row_number.cpp @@ -86,4 +86,3 @@ void WF_row_number::operator()(int64_t b, int64_t e, int64_t c) } } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_row_number.h b/storage/columnstore/columnstore/utils/windowfunction/wf_row_number.h index d0976c25..bcb8d996 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_row_number.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_row_number.h @@ -47,5 +47,3 @@ class WF_row_number : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_ROW_NUMBER_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_stats.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_stats.cpp index a4b6f4f5..73a668ac 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_stats.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_stats.cpp @@ -234,4 +234,3 @@ template boost::shared_ptr<WindowFunctionType> WF_stats<int64_t>::makeFunction(i WindowFunctionColumn*); } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_stats.h b/storage/columnstore/columnstore/utils/windowfunction/wf_stats.h index 725d1c6c..6a50df11 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_stats.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_stats.h @@ -50,5 +50,3 @@ class WF_stats : public WindowFunctionType } // namespace windowfunction #endif // UTILS_WF_STATS_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_sum_avg.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_sum_avg.cpp index d988f0a1..573b6e09 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_sum_avg.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_sum_avg.cpp @@ -306,4 +306,3 @@ template boost::shared_ptr<WindowFunctionType> WF_sum_avg<int64_t, long double>: int, const string&, int, WindowFunctionColumn*); } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_sum_avg.h b/storage/columnstore/columnstore/utils/windowfunction/wf_sum_avg.h index 14cbd356..bdb5bc38 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_sum_avg.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_sum_avg.h @@ -61,6 +61,4 @@ class WF_sum_avg : public WindowFunctionType } // namespace windowfunction -#endif // UTILS_WF_SUM_AVG_H - -// vim:ts=4 sw=4: +#endif // UTILS_WF_SUM_AVG_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_udaf.cpp b/storage/columnstore/columnstore/utils/windowfunction/wf_udaf.cpp index 274c9701..0894c6ad 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_udaf.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_udaf.cpp @@ -1191,4 +1191,3 @@ void WF_udaf::operator()(int64_t b, int64_t e, int64_t c) fPrev = c; } } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h b/storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h index ab777761..22fae5a6 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h +++ b/storage/columnstore/columnstore/utils/windowfunction/wf_udaf.h @@ -113,6 +113,4 @@ class WF_udaf : public WindowFunctionType } // namespace windowfunction -#endif // UTILS_WF_UDAF_H - -// vim:ts=4 sw=4: +#endif // UTILS_WF_UDAF_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/utils/windowfunction/windowframe.cpp b/storage/columnstore/columnstore/utils/windowfunction/windowframe.cpp index cbc9352c..491e0a0f 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/windowframe.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/windowframe.cpp @@ -81,4 +81,3 @@ const string WindowFrame::toString() const } } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/windowframe.h b/storage/columnstore/columnstore/utils/windowfunction/windowframe.h index 159ee84d..cb20c5fe 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/windowframe.h +++ b/storage/columnstore/columnstore/utils/windowfunction/windowframe.h @@ -121,5 +121,3 @@ class WindowFrame } // namespace windowfunction #endif // UTILS_WINDOWFRAME_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/windowfunction.cpp b/storage/columnstore/columnstore/utils/windowfunction/windowfunction.cpp index a0e84493..941fff91 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/windowfunction.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/windowfunction.cpp @@ -259,4 +259,3 @@ void WindowFunction::sort(std::vector<RowPosition>::iterator v, uint64_t n) } } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/windowfunction.h b/storage/columnstore/columnstore/utils/windowfunction/windowfunction.h index 53f5b9a4..2d65f8fc 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/windowfunction.h +++ b/storage/columnstore/columnstore/utils/windowfunction/windowfunction.h @@ -113,5 +113,3 @@ class WindowFunction } // namespace windowfunction #endif // UTILS_WINDOWFUNCTION_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.cpp b/storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.cpp index ccf74609..43f05f4b 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.cpp +++ b/storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.cpp @@ -797,4 +797,3 @@ void WindowFunctionType::constParms(const std::vector<SRCP>& functionParms) } } // namespace windowfunction -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.h b/storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.h index c1af9bc7..e64ac30c 100644 --- a/storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.h +++ b/storage/columnstore/columnstore/utils/windowfunction/windowfunctiontype.h @@ -305,5 +305,3 @@ extern std::map<int, std::string> colType2String; } // namespace windowfunction #endif // UTILS_WINDOWFUNCTIONTYPE_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/versioning/BRM/brmshmimpl.cpp b/storage/columnstore/columnstore/versioning/BRM/brmshmimpl.cpp index 74028241..44750c63 100644 --- a/storage/columnstore/columnstore/versioning/BRM/brmshmimpl.cpp +++ b/storage/columnstore/columnstore/versioning/BRM/brmshmimpl.cpp @@ -410,4 +410,3 @@ void BRMManagedShmImpl::remap(const bool readOnly) } // namespace BRM -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/versioning/BRM/load_brm.cpp b/storage/columnstore/columnstore/versioning/BRM/load_brm.cpp index 4378fb76..b72bd3c2 100644 --- a/storage/columnstore/columnstore/versioning/BRM/load_brm.cpp +++ b/storage/columnstore/columnstore/versioning/BRM/load_brm.cpp @@ -127,4 +127,3 @@ int main(int argc, char** argv) return 0; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/versioning/BRM/slavecomm.cpp b/storage/columnstore/columnstore/versioning/BRM/slavecomm.cpp index 7b665a1a..1f490dd8 100644 --- a/storage/columnstore/columnstore/versioning/BRM/slavecomm.cpp +++ b/storage/columnstore/columnstore/versioning/BRM/slavecomm.cpp @@ -2432,4 +2432,3 @@ void SlaveComm::do_dmlReleaseLBIDRanges(ByteStream& msg) } // namespace BRM -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/versioning/BRM/vbbm.cpp b/storage/columnstore/columnstore/versioning/BRM/vbbm.cpp index 253bd051..2ed2454d 100644 --- a/storage/columnstore/columnstore/versioning/BRM/vbbm.cpp +++ b/storage/columnstore/columnstore/versioning/BRM/vbbm.cpp @@ -40,7 +40,6 @@ #include <boost/interprocess/shared_memory_object.hpp> #include <boost/interprocess/mapped_region.hpp> -namespace bi = boost::interprocess; #include <boost/scoped_array.hpp> #include <boost/scoped_ptr.hpp> @@ -1076,8 +1075,8 @@ void VBBM::save(string filename) } var = VBBM_MAGIC_V2; - int bytesWritten = 0; - int bytesToWrite = 12; + [[maybe_unused]] int bytesWritten = 0; + [[maybe_unused]] int bytesToWrite = 12; bytesWritten += out->write((char*)&var, 4); bytesWritten += out->write((char*)&vbbm->vbCurrentSize, 4); bytesWritten += out->write((char*)&vbbm->nFiles, 4); diff --git a/storage/columnstore/columnstore/writeengine/client/we_clients.cpp b/storage/columnstore/columnstore/writeengine/client/we_clients.cpp index c696dbb6..b6d66e2e 100644 --- a/storage/columnstore/columnstore/writeengine/client/we_clients.cpp +++ b/storage/columnstore/columnstore/writeengine/client/we_clients.cpp @@ -545,4 +545,3 @@ void WEClients::addDataToOutput(SBS sbs, uint32_t connIndex) } // namespace WriteEngine -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/client/we_clients.h b/storage/columnstore/columnstore/writeengine/client/we_clients.h index 8028181a..a059b739 100644 --- a/storage/columnstore/columnstore/writeengine/client/we_clients.h +++ b/storage/columnstore/columnstore/writeengine/client/we_clients.h @@ -32,7 +32,7 @@ #include <boost/scoped_array.hpp> #include "bytestream.h" -//#include "we_message.h" +// #include "we_message.h" #include "threadsafequeue.h" #include "rwlock_local.h" #include "resourcemanager.h" @@ -181,5 +181,4 @@ class WEClients #undef EXPORT -#endif -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/writeengine/redistribute/we_redistribute.cpp b/storage/columnstore/columnstore/writeengine/redistribute/we_redistribute.cpp index d155715b..9f910193 100644 --- a/storage/columnstore/columnstore/writeengine/redistribute/we_redistribute.cpp +++ b/storage/columnstore/columnstore/writeengine/redistribute/we_redistribute.cpp @@ -52,4 +52,3 @@ void Redistribute::handleRedistributeMessage(ByteStream& bs, IOSocket& ios) } // namespace redistribute -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/redistribute/we_redistribute.h b/storage/columnstore/columnstore/writeengine/redistribute/we_redistribute.h index 62c33b83..8e01ed01 100644 --- a/storage/columnstore/columnstore/writeengine/redistribute/we_redistribute.h +++ b/storage/columnstore/columnstore/writeengine/redistribute/we_redistribute.h @@ -45,6 +45,4 @@ class Redistribute } // namespace redistribute -#endif // WE_REDISTRIBUTE_H - -// vim:ts=4 sw=4: +#endif // WE_REDISTRIBUTE_H
\ No newline at end of file diff --git a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrol.cpp b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrol.cpp index a54e47ff..9cb5e139 100644 --- a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrol.cpp +++ b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrol.cpp @@ -698,4 +698,3 @@ void RedistributeControl::logMessage(const string& msg) } // namespace redistribute -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrol.h b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrol.h index 65535051..6b466508 100644 --- a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrol.h +++ b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrol.h @@ -126,5 +126,3 @@ class RedistributeControl } // namespace redistribute #endif // WE_REDISTRIBUTECONTROL_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrolthread.cpp b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrolthread.cpp index ce808eb2..774f4011 100644 --- a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrolthread.cpp +++ b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrolthread.cpp @@ -838,4 +838,3 @@ void RedistributeControlThread::doStopAction() } // namespace redistribute -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrolthread.h b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrolthread.h index 8f3116fa..92581ebd 100644 --- a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrolthread.h +++ b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributecontrolthread.h @@ -127,5 +127,3 @@ class RedistributeControlThread } // namespace redistribute #endif // WE_REDISTRIBUTECONTROLTHREAD_H - -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributeworkerthread.cpp b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributeworkerthread.cpp index 67f1f586..5825ea53 100644 --- a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributeworkerthread.cpp +++ b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributeworkerthread.cpp @@ -1520,4 +1520,3 @@ void RedistributeWorkerThread::logMessage(const string& msg, int line) } // namespace redistribute -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributeworkerthread.h b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributeworkerthread.h index cdd3a62a..c1933bf7 100644 --- a/storage/columnstore/columnstore/writeengine/redistribute/we_redistributeworkerthread.h +++ b/storage/columnstore/columnstore/writeengine/redistribute/we_redistributeworkerthread.h @@ -142,6 +142,4 @@ class RedistributeWorkerThread } // namespace redistribute -#endif // WE_REDISTRIBUTEWORKERTHREAD_H - -// vim:ts=4 sw=4: +#endif
\ No newline at end of file diff --git a/storage/columnstore/columnstore/writeengine/server/we_ddlcommandproc.cpp b/storage/columnstore/columnstore/writeengine/server/we_ddlcommandproc.cpp index 1d832f9e..3970e6c1 100644 --- a/storage/columnstore/columnstore/writeengine/server/we_ddlcommandproc.cpp +++ b/storage/columnstore/columnstore/writeengine/server/we_ddlcommandproc.cpp @@ -4952,4 +4952,3 @@ void WE_DDLCommandProc::purgeFDCache() } } // namespace WriteEngine -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/shared/we_brm.cpp b/storage/columnstore/columnstore/writeengine/shared/we_brm.cpp index a049806b..fb5d88fa 100644 --- a/storage/columnstore/columnstore/writeengine/shared/we_brm.cpp +++ b/storage/columnstore/columnstore/writeengine/shared/we_brm.cpp @@ -1741,4 +1741,3 @@ int BRMWrapper::getExtentCPMaxMin(const BRM::LBID_t lbid, BRM::CPMaxMin& cpMaxMi } } // namespace WriteEngine -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp index b34535c7..784f9990 100644 --- a/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp +++ b/storage/columnstore/columnstore/writeengine/shared/we_chunkmanager.cpp @@ -2667,4 +2667,3 @@ int ChunkManager::checkFixLastDictChunk(const FID& fid, uint16_t root, uint32_t } } // namespace WriteEngine -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/splitter/we_splitterapp.cpp b/storage/columnstore/columnstore/writeengine/splitter/we_splitterapp.cpp index 366c64ad..22a29100 100644 --- a/storage/columnstore/columnstore/writeengine/splitter/we_splitterapp.cpp +++ b/storage/columnstore/columnstore/writeengine/splitter/we_splitterapp.cpp @@ -572,4 +572,3 @@ int main(int argc, char** argv) return SPLTR_EXIT_STATUS; } -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/wrapper/we_colop.cpp b/storage/columnstore/columnstore/writeengine/wrapper/we_colop.cpp index 25bed1eb..bbe3dc42 100644 --- a/storage/columnstore/columnstore/writeengine/wrapper/we_colop.cpp +++ b/storage/columnstore/columnstore/writeengine/wrapper/we_colop.cpp @@ -1910,4 +1910,3 @@ int ColumnOp::writeRowsValues(Column& curCol, uint64_t totalRow, const RIDList& } } // namespace WriteEngine -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/wrapper/we_tablemetadata.cpp b/storage/columnstore/columnstore/writeengine/wrapper/we_tablemetadata.cpp index 64bfff06..421ecbcb 100644 --- a/storage/columnstore/columnstore/writeengine/wrapper/we_tablemetadata.cpp +++ b/storage/columnstore/columnstore/writeengine/wrapper/we_tablemetadata.cpp @@ -109,4 +109,3 @@ ColsExtsInfoMap& TableMetaData::getColsExtsInfoMap() return fColsExtsInfoMap; } } // namespace WriteEngine -// vim:ts=4 sw=4: diff --git a/storage/columnstore/columnstore/writeengine/wrapper/we_tablemetadata.h b/storage/columnstore/columnstore/writeengine/wrapper/we_tablemetadata.h index 2e4f114a..830fecba 100644 --- a/storage/columnstore/columnstore/writeengine/wrapper/we_tablemetadata.h +++ b/storage/columnstore/columnstore/writeengine/wrapper/we_tablemetadata.h @@ -99,5 +99,4 @@ class TableMetaData #undef EXPORT -#endif -// vim:ts=4 sw=4: +#endif // WE_TABLEMETADATA_H__
\ No newline at end of file diff --git a/storage/columnstore/columnstore/writeengine/wrapper/writeengine.cpp b/storage/columnstore/columnstore/writeengine/wrapper/writeengine.cpp index 81520412..41471472 100644 --- a/storage/columnstore/columnstore/writeengine/wrapper/writeengine.cpp +++ b/storage/columnstore/columnstore/writeengine/wrapper/writeengine.cpp @@ -6628,4 +6628,3 @@ int WriteEngineWrapper::RemoveTxnFromLBIDMap(const TxnID txnid) } } // end of namespace -// vim:ts=4 sw=4: |