diff options
Diffstat (limited to 'storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp')
-rw-r--r-- | storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp | 95 |
1 files changed, 92 insertions, 3 deletions
diff --git a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp index 43c129347c0..6212f91290b 100644 --- a/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp +++ b/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp @@ -30,7 +30,6 @@ DictTabInfo::TableMapping[] = { DTIMAP2(Table, MinLoadFactor, MinLoadFactor, 0, 90), DTIMAP2(Table, MaxLoadFactor, MaxLoadFactor, 25, 110), DTIMAP2(Table, FragmentTypeVal, FragmentType, 0, 3), - DTIMAP2(Table, TableStorageVal, TableStorage, 0, 0), DTIMAP2(Table, TableTypeVal, TableType, 1, 3), DTIMAP(Table, NoOfKeyAttr, NoOfKeyAttr), DTIMAP2(Table, NoOfAttributes, NoOfAttributes, 1, MAX_ATTRIBUTES_IN_TABLE), @@ -48,6 +47,8 @@ DictTabInfo::TableMapping[] = { DTIMAP(Table, FragmentCount, FragmentCount), DTIMAP2(Table, FragmentDataLen, FragmentDataLen, 0, MAX_FRAGMENT_DATA_BYTES), DTIMAPB(Table, FragmentData, FragmentData, 0, MAX_FRAGMENT_DATA_BYTES, FragmentDataLen), + DTIMAP(Table, TablespaceId, TablespaceId), + DTIMAP(Table, TablespaceVersion, TablespaceVersion), DTIBREAK(AttributeName) }; @@ -64,9 +65,11 @@ DictTabInfo::AttributeMapping[] = { DTIMAP(Attribute, AttributeType, AttributeType), DTIMAP2(Attribute, AttributeSize, AttributeSize, 3, 7), DTIMAP2(Attribute, AttributeArraySize, AttributeArraySize, 0, 65535), + DTIMAP2(Attribute, AttributeArrayType, AttributeArrayType, 0, 3), DTIMAP2(Attribute, AttributeKeyFlag, AttributeKeyFlag, 0, 1), DTIMAP2(Attribute, AttributeNullableFlag, AttributeNullableFlag, 0, 1), DTIMAP2(Attribute, AttributeDKey, AttributeDKey, 0, 1), + DTIMAP2(Attribute, AttributeStorageType, AttributeStorageType, 0, 1), DTIMAP(Attribute, AttributeExtType, AttributeExtType), DTIMAP(Attribute, AttributeExtPrecision, AttributeExtPrecision), DTIMAP(Attribute, AttributeExtScale, AttributeExtScale), @@ -111,7 +114,6 @@ DictTabInfo::Table::init(){ MaxLoadFactor = 80; KeyLength = 0; FragmentType = DictTabInfo::AllNodesSmallTable; - TableStorage = 0; TableType = DictTabInfo::UndefTableType; TableVersion = 0; IndexState = ~0; @@ -124,15 +126,18 @@ DictTabInfo::Table::init(){ FragmentCount = 0; FragmentDataLen = 0; memset(FragmentData, 0, sizeof(FragmentData)); + TablespaceId = RNIL; + TablespaceVersion = ~0; } void DictTabInfo::Attribute::init(){ memset(AttributeName, 0, sizeof(AttributeName));//AttributeName[0] = 0; - AttributeId = 0; + AttributeId = 0xFFFF; // ZNIL AttributeType = ~0, // deprecated AttributeSize = DictTabInfo::a32Bit; AttributeArraySize = 1; + AttributeArrayType = NDB_ARRAYTYPE_FIXED; AttributeKeyFlag = 0; AttributeNullableFlag = 0; AttributeDKey = 0; @@ -141,5 +146,89 @@ DictTabInfo::Attribute::init(){ AttributeExtScale = 0, AttributeExtLength = 0, AttributeAutoIncrement = false; + AttributeStorageType = 0; memset(AttributeDefaultValue, 0, sizeof(AttributeDefaultValue));//AttributeDefaultValue[0] = 0; } + +//static +const +SimpleProperties::SP2StructMapping +DictFilegroupInfo::Mapping[] = { + DFGIMAPS(Filegroup, FilegroupName, FilegroupName, 0, MAX_TAB_NAME_SIZE), + DFGIMAP2(Filegroup, FilegroupType, FilegroupType, 0, 1), + DFGIMAP(Filegroup, FilegroupId, FilegroupId), + DFGIMAP(Filegroup, FilegroupVersion, FilegroupVersion), + + DFGIMAP(Filegroup, TS_ExtentSize, TS_ExtentSize), + DFGIMAP(Filegroup, TS_LogfileGroupId, TS_LogfileGroupId), + DFGIMAP(Filegroup, TS_LogfileGroupVersion, TS_LogfileGroupVersion), + DFGIMAP(Filegroup, TS_GrowLimit, TS_DataGrow.GrowLimit), + DFGIMAP(Filegroup, TS_GrowSizeHi, TS_DataGrow.GrowSizeHi), + DFGIMAP(Filegroup, TS_GrowSizeLo, TS_DataGrow.GrowSizeLo), + DFGIMAPS(Filegroup, TS_GrowPattern, TS_DataGrow.GrowPattern, 0, PATH_MAX), + DFGIMAP(Filegroup, TS_GrowMaxSize, TS_DataGrow.GrowMaxSize), + + DFGIMAP(Filegroup, LF_UndoBufferSize, LF_UndoBufferSize), + DFGIMAP(Filegroup, LF_UndoGrowLimit, LF_UndoGrow.GrowLimit), + DFGIMAP(Filegroup, LF_UndoGrowSizeHi, LF_UndoGrow.GrowSizeHi), + DFGIMAP(Filegroup, LF_UndoGrowSizeLo, LF_UndoGrow.GrowSizeLo), + DFGIMAPS(Filegroup, LF_UndoGrowPattern, LF_UndoGrow.GrowPattern, 0,PATH_MAX), + DFGIMAP(Filegroup, LF_UndoGrowMaxSize, LF_UndoGrow.GrowMaxSize), + + DFGIBREAK(FileName) +}; + +//static +const Uint32 DictFilegroupInfo::MappingSize = +sizeof(DictFilegroupInfo::Mapping) / sizeof(SimpleProperties::SP2StructMapping); + +//static +const +SimpleProperties::SP2StructMapping +DictFilegroupInfo::FileMapping[] = { + DFGIMAPS(File, FileName, FileName, 0, PATH_MAX), + DFGIMAP2(File, FileType, FileType, 0, 1), + DFGIMAP(File, FileNo, FileNo), + DFGIMAP(File, FileId, FileId), + DFGIMAP(File, FileFGroupId, FilegroupId), + DFGIMAP(File, FileFGroupVersion, FilegroupVersion), + DFGIMAP(File, FileSizeHi, FileSizeHi), + DFGIMAP(File, FileSizeLo, FileSizeLo), + DFGIMAP(File, FileFreeExtents, FileFreeExtents), + DFGIBREAK(FileEnd) +}; + +//static +const Uint32 DictFilegroupInfo::FileMappingSize = +sizeof(DictFilegroupInfo::FileMapping) / +sizeof(SimpleProperties::SP2StructMapping); + +void +DictFilegroupInfo::Filegroup::init(){ + memset(FilegroupName, sizeof(FilegroupName), 0); + FilegroupType = ~0; + FilegroupId = ~0; + FilegroupVersion = ~0; + + TS_ExtentSize = 0; + TS_LogfileGroupId = ~0; + TS_LogfileGroupVersion = ~0; + TS_DataGrow.GrowLimit = 0; + TS_DataGrow.GrowSizeHi = 0; + TS_DataGrow.GrowSizeLo = 0; + memset(TS_DataGrow.GrowPattern, sizeof(TS_DataGrow.GrowPattern), 0); + TS_DataGrow.GrowMaxSize = 0; +} + +void +DictFilegroupInfo::File::init(){ + memset(FileName, sizeof(FileName), 0); + FileType = ~0; + FileNo = ~0; + FileId = ~0; + FilegroupId = ~0; + FilegroupVersion = ~0; + FileSizeHi = 0; + FileSizeLo = 0; + FileFreeExtents = 0; +} |