Skip to content

Commit

Permalink
#199 B now reports: Domain unification of the specified ValuesUnit (/…
Browse files Browse the repository at this point in the history
…Kwartalen_nodata : UInt32) with the categorical calculation results ( : UInt32) is not possible (different CheckedKeyExpr)
  • Loading branch information
MaartenHilferink committed Apr 3, 2023
1 parent 29db4b5 commit 1252a81
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion tic/dll/src/AbstrDataItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ bool AbstrDataItem::CheckResultItem(const TreeItem* refItem) const
}
if (adi->GetTSF(DSF_Categorical))
{
if (!GetAbstrValuesUnit()->UnifyDomain(adi->GetAbstrValuesUnit(), "the specified ValuesUnit", "the categorical calculation results", UnifyMode::UM_AllowDefaultLeft))
if (!GetAbstrValuesUnit()->UnifyDomain(adi->GetAbstrValuesUnit(), "the specified ValuesUnit", "the categorical calculation results", UnifyMode::UM_AllowDefaultLeft, &errMsgStr))
goto failResultMsg;
SetTSF(DSF_Categorical);
}
Expand Down
6 changes: 0 additions & 6 deletions tic/dll/src/TreeItem.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2913,15 +2913,13 @@ bool TreeItem::ReadItem(const StorageReadHandle& srh) // TODO: Make this a metho
MG_DEBUGCODE( dms_assert( CheckMetaInfoReady() ); )

dms_assert(! GetCurrRefItem() ); // caller must take care of only calling ReadItem for UltimateItems
// dms_assert(! GetTSF(DSF_DSM_Allocated|TSF_DSM_SdKnown) ); // else we would be reading DataStoreCache

MG_SIGNAL_ON_UPDATEMETAINFO

auto keepInterest = GetInterestPtrOrCancel();

if (WasFailed(FR_Data))
return false;
// if (GetTSF(TSF_DataInMem | TSF_HasConfigData) || HasCalculatorImpl())
if (IsDataReady(this))
return true;

Expand All @@ -2941,15 +2939,11 @@ bool TreeItem::ReadItem(const StorageReadHandle& srh) // TODO: Make this a metho
, GetFullName().c_str()
);

// dms_assert(!DataAllocated() );

if (srh.Read())
return true;
else if (!SuspendTrigger::DidSuspend())
throwItemError("DoReadItem returned Failure");
dms_assert(GetInterestCount());
//REMOVE BECAUSE NO PROOF OF NON-REENTRANCE IS GIVEN; operations on DataWriteLock might abort after reading this
// SuspendTrigger::MarkProgress();
}
catch (...)
{
Expand Down

0 comments on commit 1252a81

Please sign in to comment.