You've already forked mariadb-columnstore-engine
							
							
				mirror of
				https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
				synced 2025-10-30 07:25:34 +03:00 
			
		
		
		
	This fixes discrepance with the server, which assigns DATE type to last_day()'s result. Now we also assigns DATE result type and, also, use proper dataconvert::Day data structure to return date. Tests agree with InnoDB. Also, this patch includes test for MCOL-5669, to show we fixed it.
		
			
				
	
	
		
			201 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			201 lines
		
	
	
		
			5.1 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /* Copyright (C) 2014 InfiniDB, Inc.
 | |
| 
 | |
|    This program is free software; you can redistribute it and/or
 | |
|    modify it under the terms of the GNU General Public License
 | |
|    as published by the Free Software Foundation; version 2 of
 | |
|    the License.
 | |
| 
 | |
|    This program is distributed in the hope that it will be useful,
 | |
|    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
|    GNU General Public License for more details.
 | |
| 
 | |
|    You should have received a copy of the GNU General Public License
 | |
|    along with this program; if not, write to the Free Software
 | |
|    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 | |
|    MA 02110-1301, USA. */
 | |
| 
 | |
| /****************************************************************************
 | |
|  * $Id: func_last_day.cpp 2477 2011-05-11 16:07:35Z chao $
 | |
|  *
 | |
|  *
 | |
|  ****************************************************************************/
 | |
| 
 | |
| #include <cstdlib>
 | |
| #include <string>
 | |
| #include <sstream>
 | |
| using namespace std;
 | |
| 
 | |
| #include "functor_int.h"
 | |
| #include "funchelpers.h"
 | |
| #include "functioncolumn.h"
 | |
| #include "rowgroup.h"
 | |
| using namespace execplan;
 | |
| 
 | |
| #include "dataconvert.h"
 | |
| using namespace dataconvert;
 | |
| 
 | |
| namespace funcexp
 | |
| {
 | |
| CalpontSystemCatalog::ColType Func_last_day::operationType(FunctionParm& /*fp*/,
 | |
|                                                            CalpontSystemCatalog::ColType& resultType)
 | |
| {
 | |
|   return resultType;
 | |
| }
 | |
| 
 | |
| int64_t Func_last_day::getIntVal(rowgroup::Row& row, FunctionParm& parm, bool& isNull,
 | |
|                                  CalpontSystemCatalog::ColType& op_ct)
 | |
| {
 | |
|   uint32_t year = 0;
 | |
|   uint32_t month = 0;
 | |
|   uint32_t day = 0;
 | |
|   int64_t val = 0;
 | |
|   DateTime aDateTime;
 | |
|   Time aTime;
 | |
| 
 | |
|   switch (parm[0]->data()->resultType().colDataType)
 | |
|   {
 | |
|     case CalpontSystemCatalog::DATE:
 | |
|       val = parm[0]->data()->getIntVal(row, isNull);
 | |
|       year = (uint32_t)((val >> 16) & 0xffff);
 | |
|       month = (uint32_t)((val >> 12) & 0xf);
 | |
|       day = (uint32_t)((val >> 6) & 0x3f);
 | |
|       break;
 | |
| 
 | |
|     case CalpontSystemCatalog::DATETIME:
 | |
|       val = parm[0]->data()->getIntVal(row, isNull);
 | |
|       year = (uint32_t)((val >> 48) & 0xffff);
 | |
|       month = (uint32_t)((val >> 44) & 0xf);
 | |
|       day = (uint32_t)((val >> 38) & 0x3f);
 | |
|       break;
 | |
| 
 | |
|     case execplan::CalpontSystemCatalog::TIMESTAMP:
 | |
|     {
 | |
|       TimeStamp timestamp(parm[0]->data()->getIntVal(row, isNull));
 | |
|       int64_t seconds = timestamp.second;
 | |
|       MySQLTime m_time;
 | |
|       gmtSecToMySQLTime(seconds, m_time, op_ct.getTimeZone());
 | |
|       year = m_time.year;
 | |
|       month = m_time.month;
 | |
|       day = m_time.day;
 | |
|       break;
 | |
|     }
 | |
| 
 | |
|     // Time adds to now() and then gets value
 | |
|     case CalpontSystemCatalog::TIME:
 | |
|       aDateTime = static_cast<DateTime>(nowDatetime());
 | |
|       aTime = parm[0]->data()->getTimeIntVal(row, isNull);
 | |
|       aTime.day = 0;
 | |
|       val = addTime(aDateTime, aTime);
 | |
|       year = (uint32_t)((val >> 48) & 0xffff);
 | |
|       month = (uint32_t)((val >> 44) & 0xf);
 | |
|       day = (uint32_t)((val >> 38) & 0x3f);
 | |
|       break;
 | |
| 
 | |
|     case CalpontSystemCatalog::CHAR:
 | |
|     case CalpontSystemCatalog::TEXT:
 | |
|     case CalpontSystemCatalog::VARCHAR:
 | |
|       val = dataconvert::DataConvert::stringToDatetime(parm[0]->data()->getStrVal(row, isNull));
 | |
| 
 | |
|       if (val == -1)
 | |
|       {
 | |
|         isNull = true;
 | |
|         return -1;
 | |
|       }
 | |
|       else
 | |
|       {
 | |
|         year = (uint32_t)((val >> 48) & 0xffff);
 | |
|         month = (uint32_t)((val >> 44) & 0xf);
 | |
|         day = (uint32_t)((val >> 38) & 0x3f);
 | |
|       }
 | |
| 
 | |
|       break;
 | |
| 
 | |
|     case CalpontSystemCatalog::BIGINT:
 | |
|     case CalpontSystemCatalog::MEDINT:
 | |
|     case CalpontSystemCatalog::SMALLINT:
 | |
|     case CalpontSystemCatalog::TINYINT:
 | |
|     case CalpontSystemCatalog::INT:
 | |
|       val = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull));
 | |
| 
 | |
|       if (val == -1)
 | |
|       {
 | |
|         isNull = true;
 | |
|         return -1;
 | |
|       }
 | |
|       else
 | |
|       {
 | |
|         year = (uint32_t)((val >> 48) & 0xffff);
 | |
|         month = (uint32_t)((val >> 44) & 0xf);
 | |
|         day = (uint32_t)((val >> 38) & 0x3f);
 | |
|       }
 | |
| 
 | |
|       break;
 | |
| 
 | |
|     case CalpontSystemCatalog::DECIMAL:
 | |
|     case CalpontSystemCatalog::UDECIMAL:
 | |
|       if (parm[0]->data()->resultType().scale == 0)
 | |
|       {
 | |
|         val = dataconvert::DataConvert::intToDatetime(parm[0]->data()->getIntVal(row, isNull));
 | |
| 
 | |
|         if (val == -1)
 | |
|         {
 | |
|           isNull = true;
 | |
|           return -1;
 | |
|         }
 | |
|         else
 | |
|         {
 | |
|           year = (uint32_t)((val >> 48) & 0xffff);
 | |
|           month = (uint32_t)((val >> 44) & 0xf);
 | |
|           day = (uint32_t)((val >> 38) & 0x3f);
 | |
|         }
 | |
|       }
 | |
|       else
 | |
|       {
 | |
|         isNull = true;
 | |
|         return -1;
 | |
|       }
 | |
| 
 | |
|       break;
 | |
| 
 | |
|     default: isNull = true; return -1;
 | |
|   }
 | |
| 
 | |
|   uint32_t lastday = day;
 | |
| 
 | |
|   if (month < 1 || month > 12)
 | |
|   {
 | |
|     isNull = true;
 | |
|     return -1;
 | |
|   }
 | |
| 
 | |
|   if (isLeapYear(year) && (month == 2))
 | |
|   {
 | |
|     lastday = 29;
 | |
|   }
 | |
|   else if (month == 2)
 | |
|   {
 | |
|     lastday = 28;
 | |
|   }
 | |
|   else
 | |
|   {
 | |
|     lastday = daysInMonth[month - 1];
 | |
|   }
 | |
| 
 | |
|   if (day > lastday)
 | |
|   {
 | |
|     isNull = true;
 | |
|     return -1;
 | |
|   }
 | |
| 
 | |
|   dataconvert::Date aDay;
 | |
|   aDay.year = year;
 | |
|   aDay.month = month;
 | |
|   aDay.day = lastday;
 | |
|   val = *(reinterpret_cast<uint32_t*>(&aDay));
 | |
|   return val;
 | |
| 
 | |
| }
 | |
| 
 | |
| }  // namespace funcexp
 |