mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
set sizes array sizes correctly in ndb blocks configuration
This commit is contained in:
parent
0e3c284b0a
commit
da7c9e26a0
1 changed files with 20 additions and 16 deletions
|
@ -590,6 +590,23 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
|
|||
*/
|
||||
ConfigValuesFactory cfg(ownConfig);
|
||||
|
||||
Uint32 noOfMetaTables= noOfTables + noOfOrderedIndexes +
|
||||
noOfUniqueHashIndexes;
|
||||
if (noOfMetaTables > MAX_TABLES)
|
||||
noOfMetaTables= MAX_TABLES;
|
||||
|
||||
{
|
||||
/**
|
||||
* Dict Size Alt values
|
||||
*/
|
||||
cfg.put(CFG_DICT_ATTRIBUTE,
|
||||
noOfAttributes);
|
||||
|
||||
cfg.put(CFG_DICT_TABLE,
|
||||
noOfMetaTables);
|
||||
}
|
||||
|
||||
|
||||
if (noOfLocalScanRecords == 0) {
|
||||
noOfLocalScanRecords = (noOfDBNodes * noOfScanRecords) + 1;
|
||||
}
|
||||
|
@ -599,7 +616,7 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
|
|||
Uint32 noOfTCScanRecords = noOfScanRecords;
|
||||
|
||||
{
|
||||
Uint32 noOfAccTables= noOfTables + noOfUniqueHashIndexes;
|
||||
Uint32 noOfAccTables= noOfMetaTables/*noOfTables+noOfUniqueHashIndexes*/;
|
||||
/**
|
||||
* Acc Size Alt values
|
||||
*/
|
||||
|
@ -641,19 +658,6 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
|
|||
cfg.put(CFG_ACC_SCAN, noOfLocalScanRecords);
|
||||
}
|
||||
|
||||
Uint32 noOfMetaTables= noOfTables + noOfOrderedIndexes +
|
||||
noOfUniqueHashIndexes;
|
||||
{
|
||||
/**
|
||||
* Dict Size Alt values
|
||||
*/
|
||||
cfg.put(CFG_DICT_ATTRIBUTE,
|
||||
noOfAttributes);
|
||||
|
||||
cfg.put(CFG_DICT_TABLE,
|
||||
noOfMetaTables);
|
||||
}
|
||||
|
||||
{
|
||||
/**
|
||||
* Dih Size Alt values
|
||||
|
@ -758,9 +762,9 @@ Configuration::calcSizeAlt(ConfigValues * ownConfig){
|
|||
* Tux Size Alt values
|
||||
*/
|
||||
cfg.put(CFG_TUX_INDEX,
|
||||
noOfOrderedIndexes);
|
||||
noOfMetaTables /*noOfOrderedIndexes*/);
|
||||
|
||||
cfg.put(CFG_TUX_FRAGMENT,
|
||||
cfg.put(CFG_TUX_FRAGMENT,
|
||||
2 * NO_OF_FRAG_PER_NODE * noOfOrderedIndexes * noOfReplicas);
|
||||
|
||||
cfg.put(CFG_TUX_ATTRIBUTE,
|
||||
|
|
Loading…
Reference in a new issue