database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

Merge branch 'develop' into S3-project

Browse Source
This commit is contained in:
Patrick LeBlanc
2019-08-14 15:37:14 -05:00
parent 73c455c949 4a4d35180a
commit fbdf1a5308
245 changed files with 3356 additions and 3224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
utils/common/crashtrace.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2018 MariaDB Corporaton
/* Copyright (C) 2018 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/common/crashtrace.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2018 MariaDB Corporaton
/* Copyright (C) 2018 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/common/nullvaluemanip.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/common/threadnaming.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2019 MariaDB Corporaton
/* Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/common/threadnaming.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2019 MariaDB Corporaton
/* Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

6
utils/dataconvert/dataconvert.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -53,7 +53,7 @@ using namespace logging;
namespace
{
const int64_t infinidb_precision[19] =
const int64_t columnstore_precision[19] =
{
0,
9,
@@ -415,7 +415,7 @@ int64_t number_int_value(const string& data,
(ct.colDataType == CalpontSystemCatalog::UDECIMAL) ||
(ct.scale > 0))
{
int64_t rangeUp = infinidb_precision[ct.precision];
int64_t rangeUp = columnstore_precision[ct.precision];
int64_t rangeLow = -rangeUp;
if (intVal > rangeUp)

2
utils/funcexp/func_abs.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_between.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_case.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

4
utils/funcexp/func_cast.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -1168,7 +1168,7 @@ IDB_Decimal Func_cast_decimal::getDecimalVal(Row& row,
int32_t decimals = parm[1]->data()->getIntVal(row, isNull);
int64_t max_length = parm[2]->data()->getIntVal(row, isNull);
// As of 2.0, max length infiniDB can support is 18
// As of 2.0, max length columnStore can support is 18
// decimal(0,0) is valid, and no limit on integer number
if (max_length > 18 || max_length <= 0)
max_length = 18;

2
utils/funcexp/func_ceil.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_coalesce.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_exp.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_floor.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_from_unixtime.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_greatest.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_hex.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_if.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_ifnull.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_in.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_isnull.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_least.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_math.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_mod.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_nullif.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_pow.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_round.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/func_substring_index.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

5
utils/funcexp/func_timediff.cpp
View File

@@ -118,7 +118,10 @@ string Func_timediff::getStrVal(rowgroup::Row& row,
case execplan::CalpontSystemCatalog::TIME:
case execplan::CalpontSystemCatalog::DATETIME:
if (type1 != type2)
// Diff between time and datetime returns NULL in MariaDB
if ((type2 == execplan::CalpontSystemCatalog::TIME ||
type2 == execplan::CalpontSystemCatalog::DATETIME) &&
type1 != type2)
{
isNull = true;
break;

2
utils/funcexp/func_truncate.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/funcexp.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/funchelpers.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/functor.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/functor.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/functor_all.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/functor_dtm.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/functor_export.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/functor_int.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/functor_real.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/funcexp/functor_str.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/joiner/joinpartition.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/joiner/tuplejoiner.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/joiner/tuplejoiner.h
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

8
utils/loggingcpp/ErrorMessage.txt
View File

@@ -86,13 +86,13 @@
2045 ERR_PRIMPROC_DOWN At least one PrimProc closed the connection unexpectedly.
2046 ERR_READ_INPUT_DATALIST Input datalist read error.
2047 ERR_LOCAL_QUERY_UM Query attempted on UM (no PM) with infinidb_local_query set.
2047 ERR_LOCAL_QUERY_UM Query attempted on UM (no PM) with columnstore_local_query set.
# disk-based join runtime errors from supported queries
2048 ERR_DBJ_FILE_IO_ERROR There was an IO error doing a disk-based join.
2049 ERR_DBJ_UNKNOWN_ERROR An unknown error error occured doing a disk-based join. Check the error log & contact support.
2050 ERR_DBJ_DISK_USAGE_LIMIT This query exceeded the temp disk usage limit. Raise infinidb_diskjoin_smallsidelimit if possible and try again.
2051 ERR_DBJ_DATA_DISTRIBUTION The data distribution in this query overflowed a disk-based join bucket. If possible, raise infinidb_diskjoin_bucketsize and try again.
2050 ERR_DBJ_DISK_USAGE_LIMIT This query exceeded the temp disk usage limit. Raise columnstore_diskjoin_smallsidelimit if possible and try again.
2051 ERR_DBJ_DATA_DISTRIBUTION The data distribution in this query overflowed a disk-based join bucket. If possible, raise columnstore_diskjoin_bucketsize and try again.
2052 INFO_SWITCHING_TO_DJS Out of UM memory, switching to disk-based join.
2053 ERR_FUNC_OUT_OF_RANGE_RESULT The result is out of range for function %1% using value(s): %2% %3%
@@ -141,7 +141,7 @@
4014 ERR_CONSTRAINTS Constraints are currently not supported in Columnstore.
4015 ERR_NOT_NULL_CONSTRAINTS Column '%1%' cannot be null.
4016 ERR_DML_DDL_SLAVE DML and DDL statements for Columnstore tables can only be run from the replication master.
4017 ERR_DML_DDL_LOCAL DML and DDL statements are not allowed when infinidb_local_query is greater than 0.
4017 ERR_DML_DDL_LOCAL DML and DDL statements are not allowed when columnstore_local_query is greater than 0.
4018 ERR_NON_SUPPORT_SYNTAX The statement is not supported in Columnstore.
# UDF

2
utils/loggingcpp/messagelog.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/loggingcpp/tdriver.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/messageqcpp/bytestream.cpp
View File

@@ -1,6 +1,6 @@
/*
Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/messageqcpp/bytestream.h
View File

@@ -1,6 +1,6 @@
/*
Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2019 MariaDB Corporaton
Copyright (C) 2019 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/messageqcpp/messagequeuepool.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/messageqcpp/messagequeuepool.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/corr.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/corr.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/covar_pop.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/covar_pop.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/covar_samp.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/covar_samp.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_avgx.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_avgx.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_avgy.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_avgy.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_count.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_count.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_intercept.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_intercept.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_r2.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_r2.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_slope.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_slope.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_sxx.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_sxx.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_sxy.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_sxy.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_syy.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/regr/regr_syy.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

1
utils/rowgroup/rowgroup.cpp
View File

@@ -1591,6 +1591,7 @@ RowGroup& RowGroup::operator+=(const RowGroup& rhs)
}
hasLongStringField = rhs.hasLongStringField || hasLongStringField;
useStringTable = rhs.useStringTable || useStringTable;
offsets = (useStringTable ? &stOffsets[0] : &oldOffsets[0]);
return *this;

3
utils/rowgroup/rowgroup.h
View File

@@ -1771,7 +1771,8 @@ inline void copyRow(const Row& in, Row* out, uint32_t colCount)
{
if (UNLIKELY(in.getColTypes()[i] == execplan::CalpontSystemCatalog::VARBINARY ||
in.getColTypes()[i] == execplan::CalpontSystemCatalog::BLOB ||
in.getColTypes()[i] == execplan::CalpontSystemCatalog::TEXT))
in.getColTypes()[i] == execplan::CalpontSystemCatalog::TEXT ||
in.getColTypes()[i] == execplan::CalpontSystemCatalog::CLOB))
out->setVarBinaryField(in.getVarBinaryStringField(i), i);
else if (UNLIKELY(in.isLongString(i)))
//out->setStringField(in.getStringField(i), i);

2
utils/startup/installdir.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/testbc/stats.cpp
View File

@@ -1,5 +1,5 @@
/* Copyright (C) 2014 InfiniDB, Inc.
Copyright (C) 2016 MariaDB Corporaton
Copyright (C) 2016 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

20
utils/threadpool/threadpool.cpp
View File

@@ -409,6 +409,24 @@ void ThreadPool::beginThread() throw()
--fIssued;
--waitingFunctorsSize;
fWaitingFunctors.erase(todo);
if (fDebug)
{
ostringstream oss;
oss << "Ending thread " << " on " << fName
<< " max " << fMaxThreads
<< " queue " << fQueueSize
<< " threads " << fThreadCount
<< " running " << fIssued
<< " waiting " << (waitingFunctorsSize - fIssued)
<< " total " << waitingFunctorsSize;
logging::Message::Args args;
logging::Message message(0);
args.add(oss.str());
message.format( args );
logging::LoggingID lid(22);
logging::MessageLog ml(lid);
ml.logWarningMessage( message );
}
}
timeout = boost::get_system_time() + boost::posix_time::minutes(10);
@@ -536,6 +554,8 @@ void ThreadPoolMonitor::operator()()
<< setw(4) << tv.tv_usec / 100
<< " Name " << fPool->fName
<< " Active " << fPool->waitingFunctorsSize
<< " running " << fPool->fIssued
<< " waiting " << (fPool->waitingFunctorsSize - fPool->fIssued)
<< " ThdCnt " << fPool->fThreadCount
<< " Max " << fPool->fMaxThreads
<< " Q " << fPool->fQueueSize

2
utils/udfsdk/allnull.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/allnull.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/avg_mode.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/avg_mode.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/avgx.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/avgx.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/distinct_count.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/distinct_count.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/mcsv1_udaf.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/mcsv1_udaf.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/median.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/median.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/ssq.cpp
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License

2
utils/udfsdk/ssq.h
View File

@@ -1,4 +1,4 @@
/* Copyright (C) 2017 MariaDB Corporaton
/* Copyright (C) 2017 MariaDB Corporation
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License