database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Remove hi_val/lo_val data members from EMCasualPartition_struct

Browse Source 
and use the union members instead.
This commit is contained in:
Gagan Goel
2020-07-27 19:22:13 -04:00
committed by Roman Nozdrin
parent 1588ebe439
commit 62c1c1e0e2
10 changed files with 135 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
dbcon/joblist/rowestimator.cpp
View File

@ -200,7 +200,7 @@ uint32_t RowEstimator::estimateDistinctValues(const execplan::CalpontSystemCatal
ret = max - min + 1;
}
if (ret > (T) fRowsPerExtent)
if (ret > fRowsPerExtent)
{
ret = fRowsPerExtent;
}
@ -251,7 +251,7 @@ float RowEstimator::estimateOpFactor(const T& min, const T& max, const T& value,
if (!datatypes::Decimal::isWideDecimalType(ct))
factor = (1.0 * max - value) / (1.0 * max - min + 1);
else
factor = (1.0 * max - value) / (1.0 * max - min + 1);
factor = ((__float128) max - value) / (max - min + 1);
}
break;
@ -264,7 +264,7 @@ float RowEstimator::estimateOpFactor(const T& min, const T& max, const T& value,
if (!datatypes::Decimal::isWideDecimalType(ct))
factor = (1.0 * max - value + 1) / (max - min + 1);
else
factor = (1.0 * max - value + 1) / (max - min + 1);
factor = ((__float128) max - value + 1) / (max - min + 1);
}
break;
@ -310,8 +310,8 @@ float RowEstimator::estimateRowReturnFactor(const BRM::EMEntry& emEntry,
// Adjust values based on column type and estimate the
if (!datatypes::Decimal::isWideDecimalType(ct))
{
adjustedMin = adjustValue(ct, emEntry.partition.cprange.lo_val);
adjustedMax = adjustValue(ct, emEntry.partition.cprange.hi_val);
adjustedMin = adjustValue(ct, emEntry.partition.cprange.loVal);
adjustedMax = adjustValue(ct, emEntry.partition.cprange.hiVal);
distinctValuesEstimate = estimateDistinctValues(
ct, adjustedMin, adjustedMax, emEntry.partition.cprange.isValid);
}
@ -452,8 +452,8 @@ float RowEstimator::estimateRowReturnFactor(const BRM::EMEntry& emEntry,
}
#if ROW_EST_DEBUG
cout << " Min-" << emEntry.partition.cprange.lo_val <<
", Max-" << emEntry.partition.cprange.hi_val <<
cout << " Min-" << emEntry.partition.cprange.loVal <<
", Max-" << emEntry.partition.cprange.hiVal <<
", Val-" << value;
#endif
@ -685,16 +685,5 @@ uint64_t RowEstimator::estimateRowsForNonCPColumn(ColumnCommandJL& colCmd)
return estimatedRows;
}
template
uint32_t RowEstimator::estimateDistinctValues<int128_t>(const execplan::CalpontSystemCatalog::ColType& ct,
const int128_t& min,
const int128_t& max,
const char cpStatus);
template
uint32_t RowEstimator::estimateDistinctValues<int64_t>(const execplan::CalpontSystemCatalog::ColType& ct,
const int64_t& min,
const int64_t& max,
const char cpStatus);
} //namespace joblist