Selaa lähdekoodia

Merge pull request #8877 from mckellyln/hpcc-15824

HPCC-15824 Thor multislave regression results

Reviewed-By: Attila Vamos <attila.vamos@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 9 vuotta sitten
vanhempi
commit
819661bf1f

+ 1 - 1
testing/regress/ecl/jsonfetch.ecl

@@ -69,6 +69,6 @@ BUILD(dsJsonFetchWithPos, {surname, RecPtr}, 'REGRESS::TEMP::jsonfetch.json.inde
 
 jsonFetchIndex := INDEX(dsJsonFetchWithPos, {surname, RecPtr}, DYNAMIC('REGRESS::TEMP::jsonfetch.json.index'));
 
-fetcheddata := LIMIT(FETCH(dsJsonFetchWithPos, jsonFetchIndex(surname = 'Mitchell'), RIGHT.RecPtr), 10);
+fetcheddata := LIMIT(SORT(FETCH(dsJsonFetchWithPos, jsonFetchIndex(surname = 'Mitchell'), RIGHT.RecPtr), RECORD), 10);
 fetchednopos := project(fetcheddata, personRecord); //don't output positions
 output(fetchednopos, named('fetched'));

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
testing/regress/ecl/key/jsonfetch.xml


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 1 - 1
testing/regress/ecl/key/xmlfetch2.xml


+ 3 - 0
testing/regress/ecl/stepping2.ecl

@@ -23,6 +23,9 @@ multiPart := #IFDEFINED(root.multiPart, false);
 
 //--- end of version configuration ---
 
+//nothor
+//Stepped Thor support
+
 import $.Setup;
 import $.Setup.TS;
 wordIndex := Setup.Files(multiPart, false).getWordIndex();

+ 1 - 1
testing/regress/ecl/xmlfetch2.ecl

@@ -68,6 +68,6 @@ BUILD(xmlWithPos, {surname, RecPtr}, 'REGRESS::TEMP::xmlfetch2.xml.index', OVERW
 
 xmlIndex := INDEX(xmlWithPos, {surname, RecPtr}, DYNAMIC('REGRESS::TEMP::xmlfetch2.xml.index'));
 
-fetcheddata := LIMIT(FETCH(xmlWithPos, xmlIndex(surname = 'Mitchell'), RIGHT.RecPtr), 10);
+fetcheddata := LIMIT(SORT(FETCH(xmlWithPos, xmlIndex(surname = 'Mitchell'), RIGHT.RecPtr), RECORD), 10);
 fetchednopos := project(fetcheddata, personRecord); //don't output positions
 output(fetchednopos, named('fetched'));