|
@@ -1595,10 +1595,6 @@ public:
|
|
|
}
|
|
|
|
|
|
protected:
|
|
|
- bool skipFileFormatCrcCheck() const
|
|
|
- {
|
|
|
- return factory->queryQueryFactory().queryOptions().skipFileFormatCrcCheck;
|
|
|
- }
|
|
|
RecordTranslationMode getEnableFieldTranslation() const
|
|
|
{
|
|
|
return factory->queryQueryFactory().queryOptions().enableFieldTranslation;
|
|
@@ -11656,7 +11652,7 @@ public:
|
|
|
diskout.setown(createBufferedIOStream(io));
|
|
|
if (extend)
|
|
|
diskout->seek(0, IFSend);
|
|
|
- tallycrc = !(helper.getFlags() & TDRnocrccheck) && !blockcompressed;
|
|
|
+ tallycrc = !blockcompressed; // MORE: Should this be controlled by an activity hint/flag?
|
|
|
Owned<IRowInterfaces> rowIf = createRowInterfaces(input->queryOutputMeta(), activityId, factory->getHeapFlags(), ctx->queryCodeContext());
|
|
|
rowSerializer.set(rowIf->queryRowSerializer());
|
|
|
unsigned rwFlags = rw_autoflush;
|
|
@@ -21766,7 +21762,7 @@ public:
|
|
|
unsigned channel = isLocal ? factory->queryQueryFactory().queryChannel() : 0;
|
|
|
unsigned expectedFormatCrc = helper.getDiskFormatCrc();
|
|
|
unsigned projectedFormatCrc = helper.getProjectedFormatCrc();
|
|
|
- translators.setown(varFileInfo->getTranslators(projectedFormatCrc, helper.queryProjectedDiskRecordSize(), expectedFormatCrc, helper.queryDiskRecordSize(), skipFileFormatCrcCheck(), getEnableFieldTranslation(), false));
|
|
|
+ translators.setown(varFileInfo->getTranslators(projectedFormatCrc, helper.queryProjectedDiskRecordSize(), expectedFormatCrc, helper.queryDiskRecordSize(), getEnableFieldTranslation(), false));
|
|
|
manager.setown(varFileInfo->getIndexManager(isOpt, channel, translators->queryActualLayout(0), false));
|
|
|
}
|
|
|
assertex(manager != NULL);
|
|
@@ -22666,7 +22662,7 @@ public:
|
|
|
unsigned channel = isLocal ? queryFactory.queryChannel() : 0;
|
|
|
unsigned expectedFormatCrc = helper->getDiskFormatCrc();
|
|
|
unsigned projectedFormatCrc = helper->getProjectedFormatCrc();
|
|
|
- translators.setown(datafile->getTranslators(projectedFormatCrc, helper->queryProjectedDiskRecordSize(), expectedFormatCrc, helper->queryDiskRecordSize(), skipFileFormatCrcCheck(), getEnableFieldTranslation(), false));
|
|
|
+ translators.setown(datafile->getTranslators(projectedFormatCrc, helper->queryProjectedDiskRecordSize(), expectedFormatCrc, helper->queryDiskRecordSize(), getEnableFieldTranslation(), false));
|
|
|
manager.setown(datafile->getIndexManager(isOpt, channel, translators->queryActualLayout(0), _graphNode.getPropBool("att[@name=\"preload\"]/@value", false)));
|
|
|
const IPropertyTree *options = datafile->queryProperties();
|
|
|
if (options)
|
|
@@ -22793,7 +22789,7 @@ public:
|
|
|
unsigned expectedCrc = indexHelper->getDiskFormatCrc();
|
|
|
IOutputMetaData *projectedMeta = indexHelper->queryProjectedDiskRecordSize();
|
|
|
IOutputMetaData *expectedMeta = indexHelper->queryDiskRecordSize();
|
|
|
- translators.setown(indexfile->getTranslators(projectedCrc, projectedMeta, expectedCrc, expectedMeta, skipFileFormatCrcCheck(), getEnableFieldTranslation(), true));
|
|
|
+ translators.setown(indexfile->getTranslators(projectedCrc, projectedMeta, expectedCrc, expectedMeta, getEnableFieldTranslation(), true));
|
|
|
keySet.setown(indexfile->getKeyArray(isOpt, isLocal ? queryFactory.queryChannel() : 0));
|
|
|
}
|
|
|
}
|
|
@@ -22884,7 +22880,7 @@ protected:
|
|
|
unsigned expectedCrc = indexHelper.getDiskFormatCrc();
|
|
|
IOutputMetaData *projectedMeta = indexHelper.queryProjectedDiskRecordSize();
|
|
|
IOutputMetaData *expectedMeta = indexHelper.queryDiskRecordSize();
|
|
|
- translators.setown(varFileInfo->getTranslators(projectedCrc, projectedMeta, expectedCrc, expectedMeta, skipFileFormatCrcCheck(), getEnableFieldTranslation(), true));
|
|
|
+ translators.setown(varFileInfo->getTranslators(projectedCrc, projectedMeta, expectedCrc, expectedMeta, getEnableFieldTranslation(), true));
|
|
|
keySet.setown(varFileInfo->getKeyArray(isOpt, isLocal ? factory->queryQueryFactory().queryChannel() : 0));
|
|
|
}
|
|
|
variableInfoPending = false;
|
|
@@ -23543,7 +23539,7 @@ class CRoxieServerSimpleIndexReadActivity : public CRoxieServerActivity, impleme
|
|
|
unsigned expectedCrc = indexHelper.getDiskFormatCrc();
|
|
|
IOutputMetaData *projectedMeta = indexHelper.queryProjectedDiskRecordSize();
|
|
|
IOutputMetaData *expectedMeta = indexHelper.queryDiskRecordSize();
|
|
|
- translators.setown(varFileInfo->getTranslators(projectedCrc, projectedMeta, expectedCrc, expectedMeta, skipFileFormatCrcCheck(), getEnableFieldTranslation(), true));
|
|
|
+ translators.setown(varFileInfo->getTranslators(projectedCrc, projectedMeta, expectedCrc, expectedMeta, getEnableFieldTranslation(), true));
|
|
|
keySet.setown(varFileInfo->getKeyArray(isOpt, isLocal ? factory->queryQueryFactory().queryChannel() : 0));
|
|
|
initKeySet();
|
|
|
variableInfoPending = false;
|
|
@@ -25460,7 +25456,7 @@ public:
|
|
|
{
|
|
|
unsigned expectedCrc = helper.getIndexFormatCrc();
|
|
|
unsigned projectedCrc = helper.getProjectedIndexFormatCrc();
|
|
|
- translators.setown(varFileInfo->getTranslators(projectedCrc, helper.queryProjectedIndexRecordSize(), expectedCrc, helper.queryIndexRecordSize(), skipFileFormatCrcCheck(), getEnableFieldTranslation(), true));
|
|
|
+ translators.setown(varFileInfo->getTranslators(projectedCrc, helper.queryProjectedIndexRecordSize(), expectedCrc, helper.queryIndexRecordSize(), getEnableFieldTranslation(), true));
|
|
|
keySet.setown(varFileInfo->getKeyArray(false, isLocal ? factory->queryQueryFactory().queryChannel() : 0));
|
|
|
}
|
|
|
}
|
|
@@ -26314,7 +26310,7 @@ public:
|
|
|
{
|
|
|
unsigned expectedCrc = helper.getIndexFormatCrc();
|
|
|
unsigned projectedCrc = helper.getProjectedIndexFormatCrc();
|
|
|
- translators.setown(varFileInfo->getTranslators(projectedCrc, helper.queryProjectedIndexRecordSize(), expectedCrc, helper.queryIndexRecordSize(), skipFileFormatCrcCheck(), getEnableFieldTranslation(), true));
|
|
|
+ translators.setown(varFileInfo->getTranslators(projectedCrc, helper.queryProjectedIndexRecordSize(), expectedCrc, helper.queryIndexRecordSize(), getEnableFieldTranslation(), true));
|
|
|
keySet.setown(varFileInfo->getKeyArray(false, isLocal ? factory->queryQueryFactory().queryChannel() : 0));
|
|
|
}
|
|
|
}
|
|
@@ -26555,7 +26551,7 @@ public:
|
|
|
{
|
|
|
unsigned expectedCrc = helper->getIndexFormatCrc();
|
|
|
unsigned projectedCrc = helper->getProjectedIndexFormatCrc();
|
|
|
- keyTranslators.setown(indexfile->getTranslators(projectedCrc, helper->queryProjectedIndexRecordSize(), expectedCrc, helper->queryIndexRecordSize(), skipFileFormatCrcCheck(), getEnableFieldTranslation(), true));
|
|
|
+ keyTranslators.setown(indexfile->getTranslators(projectedCrc, helper->queryProjectedIndexRecordSize(), expectedCrc, helper->queryIndexRecordSize(), getEnableFieldTranslation(), true));
|
|
|
keySet.setown(indexfile->getKeyArray(isOpt, isLocal ? queryFactory.queryChannel() : 0));
|
|
|
}
|
|
|
}
|
|
@@ -26581,7 +26577,7 @@ public:
|
|
|
{
|
|
|
unsigned expectedCrc = helper->getDiskFormatCrc();
|
|
|
unsigned projectedCrc = helper->getProjectedFormatCrc();
|
|
|
- translators.setown(datafile->getTranslators(expectedCrc, helper->queryProjectedDiskRecordSize(), projectedCrc, helper->queryDiskRecordSize(), skipFileFormatCrcCheck(), getEnableFieldTranslation(), false));
|
|
|
+ translators.setown(datafile->getTranslators(expectedCrc, helper->queryProjectedDiskRecordSize(), projectedCrc, helper->queryDiskRecordSize(), getEnableFieldTranslation(), false));
|
|
|
files.setown(datafile->getIFileIOArray(isFetchOpt, queryFactory.queryChannel()));
|
|
|
}
|
|
|
else
|