Selaa lähdekoodia

Merge pull request #15950 from jakesmith/HPCC-27431-reinstate-indexlimittest

HPCC-27431 Reinstate index limit test

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 3 vuotta sitten
vanhempi
commit
1344aded0a
2 muutettua tiedostoa jossa 11 lisäystä ja 8 poistoa
  1. 1 1
      testing/regress/ecl/indexlimit3.ecl
  2. 10 7
      testing/regress/ecl/key/indexlimit3.xml

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

@@ -74,7 +74,7 @@ SEQUENTIAL(
  OUTPUT(COUNT(LIMIT(fi, 4, KEYED, ONFAIL(TRANSFORM(RECORDOF(fi), SELF.info := '**KEYED LIMIT HIT IN INDEXCOUNT**'; SELF := [])))));
 
 // indexnormalize
- //OUTPUT(LIMIT(fi.kkeys(ckey>=992), 2, ONFAIL(TRANSFORM(RECORDOF(crec), SELF.info := '**ROW LIMIT HIT IN INDEXNORMALIZE**'; SELF := []))));
+ OUTPUT(LIMIT(fi.kkeys(ckey>=992), 2, ONFAIL(TRANSFORM(RECORDOF(crec), SELF.info := '**ROW LIMIT HIT IN INDEXNORMALIZE**'; SELF := []))));
 
 
 // Under limits

+ 10 - 7
testing/regress/ecl/key/indexlimit3.xml

@@ -21,9 +21,7 @@
  <Row><Result_7>1</Result_7></Row>
 </Dataset>
 <Dataset name='Result 8'>
- <Row><key>1</key><key2>2</key2><v>6</v><kkeys><Row><ckey>992</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
- <Row><key>1</key><key2>2</key2><v>7</v><kkeys><Row><ckey>993</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
- <Row><key>1</key><key2>2</key2><v>8</v><kkeys><Row><ckey>994</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
+ <Row><ckey>0</ckey><info>**ROW LIMIT HIT IN INDEXNORMALIZE**</info></Row>
 </Dataset>
 <Dataset name='Result 9'>
  <Row><key>1</key><key2>2</key2><v>6</v><kkeys><Row><ckey>992</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
@@ -31,22 +29,27 @@
  <Row><key>1</key><key2>2</key2><v>8</v><kkeys><Row><ckey>994</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
 </Dataset>
 <Dataset name='Result 10'>
- <Row><Result_10>3</Result_10></Row>
+ <Row><key>1</key><key2>2</key2><v>6</v><kkeys><Row><ckey>992</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
+ <Row><key>1</key><key2>2</key2><v>7</v><kkeys><Row><ckey>993</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
+ <Row><key>1</key><key2>2</key2><v>8</v><kkeys><Row><ckey>994</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
 </Dataset>
 <Dataset name='Result 11'>
  <Row><Result_11>3</Result_11></Row>
 </Dataset>
 <Dataset name='Result 12'>
- <Row><Result_12>true</Result_12></Row>
+ <Row><Result_12>3</Result_12></Row>
 </Dataset>
 <Dataset name='Result 13'>
- <Row><key>1</key><key2>2</key2><v>6</v><kkeys><Row><ckey>992</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
+ <Row><Result_13>true</Result_13></Row>
 </Dataset>
 <Dataset name='Result 14'>
+ <Row><key>1</key><key2>2</key2><v>6</v><kkeys><Row><ckey>992</ckey><info></info></Row></kkeys><info></info><__internal_fpos__>0</__internal_fpos__></Row>
+</Dataset>
+<Dataset name='Result 15'>
  <Row><ckey>992</ckey><info></info></Row>
  <Row><ckey>993</ckey><info></info></Row>
  <Row><ckey>994</ckey><info></info></Row>
 </Dataset>
-<Dataset name='Result 15'>
+<Dataset name='Result 16'>
  <Row><ckey>994</ckey><info></info></Row>
 </Dataset>