Merge pull request #6058 from AttilaVamos/HPCC-11640-fix

HPCC-11640 Use new --exception-level=warning option to ignore extra logging

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>

testing/regress/ecl-test

@@ -31,7 +31,7 @@ from hpcc.util.ecl.file import ECLFile
 from hpcc.util.util import checkPqParam,  getVersionNumbers,  checkXParam,  convertPath
 from hpcc.common.error import Error
 
-prog_version = "0.0.22"
+prog_version = "0.0.23"
 
 # For coverage
 if ('coverage' in os.environ) and (os.environ['coverage'] == '1'):

testing/regress/ecl/key/apply.xml

@@ -1,21 +1,3 @@
-<Info><Source>user</Source><Message>Begin Apply....</Message></Info>
-<Info><Source>user</Source><Message>0,</Message></Info>
-<Info><Source>user</Source><Message>0,</Message></Info>
-<Info><Source>user</Source><Message>1</Message></Info>
-<Info><Source>user</Source><Message>xx                  </Message></Info>
-<Info><Source>user</Source><Message>0,</Message></Info>
-<Info><Source>user</Source><Message>0,</Message></Info>
-<Info><Source>user</Source><Message>2</Message></Info>
-<Info><Source>user</Source><Message>xx                  </Message></Info>
-<Info><Source>user</Source><Message>0,</Message></Info>
-<Info><Source>user</Source><Message>0,</Message></Info>
-<Info><Source>user</Source><Message>3</Message></Info>
-<Info><Source>user</Source><Message>xx                  </Message></Info>
-<Info><Source>user</Source><Message>0,</Message></Info>
-<Info><Source>user</Source><Message>0,</Message></Info>
-<Info><Source>user</Source><Message>4</Message></Info>
-<Info><Source>user</Source><Message>xx                  </Message></Info>
-<Info><Source>user</Source><Message>...End Apply</Message></Info>
 <Dataset name='Result 2'>
  <Row><message>Begin Apply....</message></Row>
  <Row><message>0,</message></Row>

testing/regress/ecl/key/external.xml

@@ -1,7 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;file::localhost::var::lib::^h^p^c^c^systems::mydropzone::external1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;file::localhost::var::lib::^h^p^c^c^systems::mydropzone::external2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;file::localhost::var::lib::^h^p^c^c^systems::mydropzone::external1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;file::localhost::var::lib::^h^p^c^c^systems::mydropzone::external2&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/fileservice.xml

@@ -1,7 +1,3 @@
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;regress::renametest.d00, &apos;regress::afterrename1.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;regress::afterrename1.d00, &apos;regress::scope1::scope2::afterrename2.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;regress::scope1::scope2::afterrename2.d00, &apos;regress::scope1::afterrename3.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;regress::scope1::afterrename3.d00&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/issue10022.xml

@@ -1,11 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;regress::persist_gh1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;regress::persist_gh2__p191248475&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;regress::persist_gh3__p3342818403&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;regress::persist_gh4__p3875155505&apos;) done</Message></Info>
-<Info><Source>eclagent</Source><Message>Rebuilding PERSIST(&apos;~REGRESS::persist_gh1&apos;): Persistent file does not exist</Message></Info>
-<Info><Source>eclagent</Source><Message>Rebuilding PERSIST(&apos;~REGRESS::persist_gh2__p191248475&apos;): Persistent file does not exist</Message></Info>
-<Info><Source>eclagent</Source><Message>Rebuilding PERSIST(&apos;~REGRESS::persist_gh3__p3342818403&apos;): Persistent file does not exist</Message></Info>
-<Info><Source>eclagent</Source><Message>Rebuilding PERSIST(&apos;~REGRESS::persist_gh4__p3875155505&apos;): Persistent file does not exist</Message></Info>
 <Dataset name='Result 2'>
  <Row><line>!Hello</line></Row>
  <Row><line> me </line></Row>

testing/regress/ecl/key/persist_replicate.xml

@@ -1,5 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;REGRESS::PersistReplicate&apos;) done</Message></Info>
-<Info><Source>eclagent</Source><Message>Building PERSIST(&apos;~REGRESS::PersistReplicate&apos;): It hasn&apos;t been calculated before</Message></Info>
 <Dataset name='Result 1'>
  <Row><name>foo</name><city>london</city><phone>123456</phone></Row>
  <Row><name>bar</name><city>cambridge</city><phone>321654</phone></Row>

testing/regress/ecl/key/setup.xml

@@ -1,15 +1,3 @@
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_Parent.d00&apos;,&apos;REGRESS::hthor::DG_Child.d00&apos;,&apos;DG_ParentID&apos;,&apos;DG_ParentID&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_Child.d00&apos;,&apos;REGRESS::hthor::DG_GrandChild.d00&apos;,&apos;DG_ParentID&apos;,&apos;DG_ParentID&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_Parent.d00&apos;,&apos;REGRESS::hthor::DG_CSV&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_Parent.d00&apos;,&apos;REGRESS::hthor::DG_XML&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_FLAT&apos;,&apos;REGRESS::hthor::DG_INDEX&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_FLAT&apos;,&apos;REGRESS::hthor::DG_INDEX&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_FLAT_EVENS&apos;,&apos;REGRESS::hthor::DG_INDEX_EVENS&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_FLAT_EVENS&apos;,&apos;REGRESS::hthor::DG_INDEX_EVENS&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_VAR&apos;,&apos;REGRESS::hthor::DG_VARINDEX&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_VAR&apos;,&apos;REGRESS::hthor::DG_VARINDEX&apos;,&apos;__fileposition__&apos;,&apos;__filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_VAR&apos;,&apos;REGRESS::hthor::DG_VARVARINDEX&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::DG_VAR&apos;,&apos;REGRESS::hthor::DG_VARVARINDEX&apos;,&apos;__fileposition__&apos;,&apos;__filepos&apos;,&apos;link&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/setup_fetch.xml

@@ -1,9 +1,3 @@
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::C.DG_FetchFile&apos;,&apos;REGRESS::hthor::C.DG_FetchFilePreload&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::C.DG_FetchFile&apos;,&apos;REGRESS::hthor::C.DG_FetchFilePreloadIndexed&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::C.DG_FetchFile&apos;,&apos;REGRESS::hthor::DG_FetchIndex1&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::C.DG_FetchFile&apos;,&apos;REGRESS::hthor::DG_FetchIndex1&apos;,&apos;__fileposition__&apos;,&apos;__filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::C.DG_FetchFile&apos;,&apos;REGRESS::hthor::DG_FetchIndex2&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::C.DG_FetchFile&apos;,&apos;REGRESS::hthor::DG_FetchIndex2&apos;,&apos;__fileposition__&apos;,&apos;__filepos&apos;,&apos;link&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/setupsq.xml

@@ -1,21 +1,3 @@
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::SimplePersonBook&apos;,&apos;REGRESS::hthor::SimplePersonBookIndex&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::SimplePersonBook&apos;,&apos;REGRESS::hthor::SimplePersonBookIndex&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::House&apos;,&apos;REGRESS::hthor::Person&apos;,&apos;id&apos;,&apos;houseid&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::Person&apos;,&apos;REGRESS::hthor::Book&apos;,&apos;id&apos;,&apos;personid&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::House&apos;,&apos;REGRESS::hthor::HousePersonBook&apos;,&apos;id&apos;,&apos;id&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::House&apos;,&apos;REGRESS::hthor::PersonBook&apos;,&apos;id&apos;,&apos;houseid&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::House&apos;,&apos;REGRESS::hthor::HouseIndexID&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::House&apos;,&apos;REGRESS::hthor::HouseIndexID&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::Person&apos;,&apos;REGRESS::hthor::PersonIndexID&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::Person&apos;,&apos;REGRESS::hthor::PersonIndexID&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::Book&apos;,&apos;REGRESS::hthor::BookIndexID&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::Book&apos;,&apos;REGRESS::hthor::BookIndexID&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::House&apos;,&apos;REGRESS::hthor::HouseIndex&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::House&apos;,&apos;REGRESS::hthor::HouseIndex&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::Person&apos;,&apos;REGRESS::hthor::PersonIndex&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::PersonIndexID&apos;,&apos;REGRESS::hthor::PersonIndex&apos;,&apos;id&apos;,&apos;id&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::Book&apos;,&apos;REGRESS::hthor::BookIndex&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::hthor::BookIndexID&apos;,&apos;REGRESS::hthor::BookIndex&apos;,&apos;id&apos;,&apos;id&apos;,&apos;link&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/superfile1.xml

@@ -1,63 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile2&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile3&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile4&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_subfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_subfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_subfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_subfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile2&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_subfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_subfile5&apos;, 4) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>SwapSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_superfile2&apos;) &apos;trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile2&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_subfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_subfile5&apos;, 4) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>SwapSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_superfile2&apos;) &apos;trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>ClearSuperFile (&apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>ClearSuperFile (&apos;hthor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_superfile1&apos;, addcontents) done</Message></Info>
-<Info><Source>fileservices</Source><Message>ClearSuperFile (&apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile1&apos;, del) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile1&apos;, del) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile2&apos;, del) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile3&apos;, del) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_superfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile4&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile1&apos;, &apos;hthor::regress::t1_subfile4&apos;, del) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;hthor::regress::t1_superfile2&apos;, &apos;hthor::regress::t1_superfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::t1_subfile5&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/superfile10.xml

@@ -1,10 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::subfile14&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::subfile15&apos;) added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::subfile15&apos;) added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/superfile2.xml

@@ -1,20 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;.::superfile3&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;.::superfile4&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;.::superfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;.::superfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;.::superfile3&apos;, &apos;.::superfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;.::superfile4&apos;, &apos;.::subfile6&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;.::superfile3&apos;, &apos;.::superfile4&apos;, del, remcontents) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;.::superfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;.::superfile3&apos;, &apos;.::superfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;.::superfile4&apos;, &apos;.::subfile6&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;.::superfile3&apos;, &apos;.::superfile4&apos;, del, remcontents) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;.::superfile3&apos;, &apos;.::superfile4&apos;, del, remcontents) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;.::superfile3&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/superfile5.xml

@@ -1,13 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t5_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t5_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t5_superfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t5_superfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t5_superfile5&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::t5_superfile5&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::t5_superfile5&apos;, &apos;hthor::regress::t5_subfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::t5_superfile5&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::t5_superfile5&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::xyzzy&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/superfile6.xml

@@ -1,5 +1 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;t6::superfile&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;t6::subfile&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;t6::superfile&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;t6::superfile&apos;, &apos;t6::subfile&apos;) done</Message></Info>
 <Exception><Source>eclagent</Source><Message>System error: 0: AddSuperFile: Adding super file t6::superfile to itself!</Message></Exception>

testing/regress/ecl/key/superfile7.xml

@@ -1,20 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::superfile7&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::superfile7&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile7&apos;, &apos;hthor::regress::subfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile7&apos;, &apos;hthor::regress::subfile2&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile7&apos;, &apos;hthor::regress::subfile3&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile7&apos;, &apos;hthor::regress::subfile4&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::superfile7&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::superfile7&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::superfile7&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/superfile8.xml

@@ -1,28 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::superfile8&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::superfile8&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile5&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile6&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile7&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile8&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::superfile8&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::superfile8&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile5&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile6&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile7&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile8&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::superfile8&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;hthor::regress::superfile8&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile5&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile6&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile7&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;hthor::regress::superfile8&apos;, &apos;hthor::regress::subfile8&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;hthor::regress::superfile8&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/superfile9.xml

@@ -1,12 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::subfile12&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::subfile13&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;hthor::regress::subfile10, &apos;hthor::regress::subfile12&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;hthor::regress::subfile11, &apos;hthor::regress::subfile13&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;hthor::regress::subfile11, &apos;hthor::regress::subfile13&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/superkey1.xml

@@ -1,18 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;REGRESS::superalbums.key&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;REGRESS::superalbums&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;REGRESS::superalbums.key&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;REGRESS::superalbums.key&apos;, &apos;REGRESS::albums1.key&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;REGRESS::superalbums.key&apos;, &apos;REGRESS::albums2.key&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;REGRESS::superalbums.key&apos;, &apos;REGRESS::albums3.key&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;REGRESS::superalbums.key&apos;, &apos;REGRESS::albums4.key&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;REGRESS::superalbums.key&apos;, &apos;REGRESS::albums5.key&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;REGRESS::superalbums.key&apos;, &apos;REGRESS::albums2.key&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;REGRESS::superalbums.key&apos;, &apos;REGRESS::albums4.key&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;REGRESS::superalbums.key&apos;, &apos;REGRESS::albums3.key&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/key/update.xml

@@ -1,11 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::base.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::out1.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::out2.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::out3.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::out4.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::out5.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::out6.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;hthor::regress::outi1.idx&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/setup/thor/setup.xml

@@ -1,15 +1,3 @@
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_Parent.d00&apos;,&apos;REGRESS::thorlcr::DG_Child.d00&apos;,&apos;DG_ParentID&apos;,&apos;DG_ParentID&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_Child.d00&apos;,&apos;REGRESS::thorlcr::DG_GrandChild.d00&apos;,&apos;DG_ParentID&apos;,&apos;DG_ParentID&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_Parent.d00&apos;,&apos;REGRESS::thorlcr::DG_CSV&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_Parent.d00&apos;,&apos;REGRESS::thorlcr::DG_XML&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_FLAT&apos;,&apos;REGRESS::thorlcr::DG_INDEX&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_FLAT&apos;,&apos;REGRESS::thorlcr::DG_INDEX&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_FLAT_EVENS&apos;,&apos;REGRESS::thorlcr::DG_INDEX_EVENS&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_FLAT_EVENS&apos;,&apos;REGRESS::thorlcr::DG_INDEX_EVENS&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_VAR&apos;,&apos;REGRESS::thorlcr::DG_VARINDEX&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_VAR&apos;,&apos;REGRESS::thorlcr::DG_VARINDEX&apos;,&apos;__fileposition__&apos;,&apos;__filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_VAR&apos;,&apos;REGRESS::thorlcr::DG_VARVARINDEX&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::DG_VAR&apos;,&apos;REGRESS::thorlcr::DG_VARVARINDEX&apos;,&apos;__fileposition__&apos;,&apos;__filepos&apos;,&apos;link&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/setup/thor/setup_fetch.xml

@@ -1,9 +1,3 @@
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::C.DG_FetchFile&apos;,&apos;REGRESS::thorlcr::C.DG_FetchFilePreload&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::C.DG_FetchFile&apos;,&apos;REGRESS::thorlcr::C.DG_FetchFilePreloadIndexed&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::C.DG_FetchFile&apos;,&apos;REGRESS::thorlcr::DG_FetchIndex1&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::C.DG_FetchFile&apos;,&apos;REGRESS::thorlcr::DG_FetchIndex1&apos;,&apos;__fileposition__&apos;,&apos;__filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::C.DG_FetchFile&apos;,&apos;REGRESS::thorlcr::DG_FetchIndex2&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::C.DG_FetchFile&apos;,&apos;REGRESS::thorlcr::DG_FetchIndex2&apos;,&apos;__fileposition__&apos;,&apos;__filepos&apos;,&apos;link&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/setup/thor/setupsq.xml

@@ -1,21 +1,3 @@
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::SimplePersonBook&apos;,&apos;REGRESS::thorlcr::SimplePersonBookIndex&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::SimplePersonBook&apos;,&apos;REGRESS::thorlcr::SimplePersonBookIndex&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::House&apos;,&apos;REGRESS::thorlcr::Person&apos;,&apos;id&apos;,&apos;houseid&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::Person&apos;,&apos;REGRESS::thorlcr::Book&apos;,&apos;id&apos;,&apos;personid&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::House&apos;,&apos;REGRESS::thorlcr::HousePersonBook&apos;,&apos;id&apos;,&apos;id&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::House&apos;,&apos;REGRESS::thorlcr::PersonBook&apos;,&apos;id&apos;,&apos;houseid&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::House&apos;,&apos;REGRESS::thorlcr::HouseIndexID&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::House&apos;,&apos;REGRESS::thorlcr::HouseIndexID&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::Person&apos;,&apos;REGRESS::thorlcr::PersonIndexID&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::Person&apos;,&apos;REGRESS::thorlcr::PersonIndexID&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::Book&apos;,&apos;REGRESS::thorlcr::BookIndexID&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::Book&apos;,&apos;REGRESS::thorlcr::BookIndexID&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::House&apos;,&apos;REGRESS::thorlcr::HouseIndex&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::House&apos;,&apos;REGRESS::thorlcr::HouseIndex&apos;,&apos;__fileposition__&apos;,&apos;filepos&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::Person&apos;,&apos;REGRESS::thorlcr::PersonIndex&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::PersonIndexID&apos;,&apos;REGRESS::thorlcr::PersonIndex&apos;,&apos;id&apos;,&apos;id&apos;,&apos;link&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::Book&apos;,&apos;REGRESS::thorlcr::BookIndex&apos;,&apos;&apos;,&apos;&apos;,&apos;view&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddFileRelationship(&apos;REGRESS::thorlcr::BookIndexID&apos;,&apos;REGRESS::thorlcr::BookIndex&apos;,&apos;id&apos;,&apos;id&apos;,&apos;link&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/thor/optflag.xml

@@ -1,22 +1,3 @@
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::nor::this&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::nor::this&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::nor::this&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::nor::this&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::nor::this&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::nor::this&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::nor::this&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file::again&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file::again&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file::again&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file::again&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file::either&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file::either&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file::either&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file::either&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::nor::this&apos; was missing but declared optional</Message></Info>
-<Info><Source></Source><Message>Input file &apos;thor::regress::no::such::file&apos; was missing but declared optional</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/thor/superfile1.xml

@@ -1,63 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile2&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile3&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile4&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_subfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_subfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_subfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_subfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile2&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_subfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_subfile5&apos;, 4) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>SwapSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_superfile2&apos;) &apos;trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile2&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_subfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_subfile5&apos;, 4) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>SwapSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_superfile2&apos;) &apos;trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>ClearSuperFile (&apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>ClearSuperFile (&apos;thor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_superfile1&apos;, addcontents) done</Message></Info>
-<Info><Source>fileservices</Source><Message>ClearSuperFile (&apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile1&apos;, del) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile1&apos;, del) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile2&apos;, del) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::t1_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile3&apos;, del) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_superfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile4&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile1&apos;, &apos;thor::regress::t1_subfile4&apos;, del) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>RemoveSuperFile (&apos;thor::regress::t1_superfile2&apos;, &apos;thor::regress::t1_superfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::t1_subfile5&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/thor/superfile10.xml

@@ -1,10 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::subfile14&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::subfile15&apos;) added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::subfile15&apos;) added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/thor/superfile5.xml

@@ -1,13 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t5_superfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t5_superfile2&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t5_superfile3&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t5_superfile4&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t5_superfile5&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::t5_superfile5&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::t5_superfile5&apos;, &apos;thor::regress::t5_subfile1&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::t5_superfile5&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::t5_superfile5&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::xyzzy&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/thor/superfile7.xml

@@ -1,20 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::superfile7&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::superfile7&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile7&apos;, &apos;thor::regress::subfile1&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile7&apos;, &apos;thor::regress::subfile2&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile7&apos;, &apos;thor::regress::subfile3&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile7&apos;, &apos;thor::regress::subfile4&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::superfile7&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::superfile7&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::superfile7&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/thor/superfile8.xml

@@ -1,28 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::superfile8&apos;) file not found</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::superfile8&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile5&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile6&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile7&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile8&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::superfile8&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::superfile8&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile5&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile6&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile7&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile8&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::superfile8&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>CreateSuperFile (&apos;thor::regress::superfile8&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile5&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile6&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile7&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>AddSuperFile (&apos;thor::regress::superfile8&apos;, &apos;thor::regress::subfile8&apos;) trans</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteSuperFile (&apos;thor::regress::superfile8&apos;) action added to transaction</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/thor/superfile9.xml

@@ -1,12 +1,3 @@
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::subfile12&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::subfile13&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;thor::regress::subfile10, &apos;thor::regress::subfile12&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;thor::regress::subfile11, &apos;thor::regress::subfile13&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction rollback</Message></Info>
-<Info><Source>fileservices</Source><Message>StartSuperFileTransaction</Message></Info>
-<Info><Source>fileservices</Source><Message>RenameLogicalFile (&apos;thor::regress::subfile11, &apos;thor::regress::subfile13&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>FinishSuperFileTransaction commit</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/ecl/thor/update.xml

@@ -7,14 +7,6 @@
 <Warning><Code>10125</Code><Source></Source><Message>Graph[47], diskwrite[56]: output file = &apos;thor::regress::out6.d00&apos; - is up to date - it will not be rebuilt</Message></Warning>
 <Warning><Code>10125</Code><Source></Source><Message>Graph[57], diskwrite[66]: output file = &apos;thor::regress::out6.d00&apos; - is up to date - it will not be rebuilt</Message></Warning>
 <Warning><Code>10125</Code><Source></Source><Message>Graph[67], indexwrite[70]: output file = &apos;thor::regress::outi1.idx&apos; - is up to date - it will not be rebuilt</Message></Warning>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::base.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::out1.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::out2.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::out3.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::out4.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::out5.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::out6.d00&apos;) done</Message></Info>
-<Info><Source>fileservices</Source><Message>DeleteLogicalFile (&apos;thor::regress::outi1.idx&apos;) done</Message></Info>
 <Dataset name='Result 1'>
 </Dataset>
 <Dataset name='Result 2'>

testing/regress/hpcc/util/ecl/command.py

@@ -36,9 +36,9 @@ class ECLcmd(Shell):
         args = []
         args.append(cmd)
         args.append('-v')
-        args.append('--cluster=' + cluster)
         args.append('-fpickBestEngine=false')
         args.append('--target=' + cluster)
+        args.append('--cluster=' + cluster)
 
         username = kwargs.pop('username', False)
         if username:
@@ -60,6 +60,7 @@ class ECLcmd(Shell):
             args.append("--name=" + name)
 
         else:
+            args.append('--exception-level=warning')
             args.append('--noroot')
             server = kwargs.pop('server', False)
             if server: