0196c5da8c1e2f111e633dfd05356a0ddaf09f7e
[lhc/web/wiklou.git] / tests / phpunit / includes / Revision / RevisionQueryInfoTest.php
1 <?php
2
3 namespace MediaWiki\Tests\Revision;
4
5 use MediaWiki\MediaWikiServices;
6 use MediaWiki\Revision\SlotRecord;
7 use MediaWikiTestCase;
8 use Revision;
9
10 /**
11 * Tests RevisionStore against the post-migration MCR DB schema.
12 *
13 * @group RevisionStore
14 * @group Storage
15 * @group Database
16 */
17 class RevisionQueryInfoTest extends MediaWikiTestCase {
18
19 protected function getRevisionQueryFields( $returnTextIdField = true ) {
20 $fields = [
21 'rev_id',
22 'rev_page',
23 'rev_timestamp',
24 'rev_minor_edit',
25 'rev_deleted',
26 'rev_len',
27 'rev_parent_id',
28 'rev_sha1',
29 ];
30 if ( $returnTextIdField ) {
31 $fields[] = 'rev_text_id';
32 }
33 return $fields;
34 }
35
36 protected function getArchiveQueryFields( $returnTextFields = true ) {
37 $fields = [
38 'ar_id',
39 'ar_page_id',
40 'ar_namespace',
41 'ar_title',
42 'ar_rev_id',
43 'ar_timestamp',
44 'ar_minor_edit',
45 'ar_deleted',
46 'ar_len',
47 'ar_parent_id',
48 'ar_sha1',
49 ];
50 if ( $returnTextFields ) {
51 $fields[] = 'ar_text_id';
52 }
53 return $fields;
54 }
55
56 protected function getNewCommentQueryFields( $prefix ) {
57 return [
58 "{$prefix}_comment_text" => "comment_{$prefix}_comment.comment_text",
59 "{$prefix}_comment_data" => "comment_{$prefix}_comment.comment_data",
60 "{$prefix}_comment_cid" => "comment_{$prefix}_comment.comment_id",
61 ];
62 }
63
64 protected function getNewActorQueryFields( $prefix, $tmp = false ) {
65 return [
66 "{$prefix}_user" => "actor_{$prefix}_user.actor_user",
67 "{$prefix}_user_text" => "actor_{$prefix}_user.actor_name",
68 "{$prefix}_actor" => $tmp ? "temp_{$prefix}_user.{$prefix}actor_actor" : "{$prefix}_actor",
69 ];
70 }
71
72 protected function getTextQueryFields() {
73 return [
74 'old_text',
75 'old_flags',
76 ];
77 }
78
79 protected function getPageQueryFields() {
80 return [
81 'page_namespace',
82 'page_title',
83 'page_id',
84 'page_latest',
85 'page_is_redirect',
86 'page_len',
87 ];
88 }
89
90 protected function getUserQueryFields() {
91 return [
92 'user_name',
93 ];
94 }
95
96 protected function getContentHandlerQueryFields( $prefix ) {
97 return [
98 "{$prefix}_content_format",
99 "{$prefix}_content_model",
100 ];
101 }
102
103 public function provideArchiveQueryInfo() {
104 yield 'MCR, comment, actor' => [
105 [
106 'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
107 ],
108 [
109 'tables' => [
110 'archive',
111 'actor_ar_user' => 'actor',
112 'comment_ar_comment' => 'comment',
113 ],
114 'fields' => array_merge(
115 $this->getArchiveQueryFields( false ),
116 $this->getNewActorQueryFields( 'ar' ),
117 $this->getNewCommentQueryFields( 'ar' )
118 ),
119 'joins' => [
120 'comment_ar_comment'
121 => [ 'JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
122 'actor_ar_user' => [ 'JOIN', 'actor_ar_user.actor_id = ar_actor' ],
123 ],
124 ]
125 ];
126 yield 'read-new MCR, comment, actor' => [
127 [
128 'wgContentHandlerUseDB' => true,
129 'wgMultiContentRevisionSchemaMigrationStage'
130 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
131 ],
132 [
133 'tables' => [
134 'archive',
135 'actor_ar_user' => 'actor',
136 'comment_ar_comment' => 'comment',
137 ],
138 'fields' => array_merge(
139 $this->getArchiveQueryFields( false ),
140 $this->getNewActorQueryFields( 'ar' ),
141 $this->getNewCommentQueryFields( 'ar' )
142 ),
143 'joins' => [
144 'comment_ar_comment'
145 => [ 'JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
146 'actor_ar_user' => [ 'JOIN', 'actor_ar_user.actor_id = ar_actor' ],
147 ],
148 ]
149 ];
150 yield 'MCR write-both/read-old' => [
151 [
152 'wgContentHandlerUseDB' => true,
153 'wgMultiContentRevisionSchemaMigrationStage'
154 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
155 ],
156 [
157 'tables' => [
158 'archive',
159 'actor_ar_user' => 'actor',
160 'comment_ar_comment' => 'comment',
161 ],
162 'fields' => array_merge(
163 $this->getArchiveQueryFields( true ),
164 $this->getContentHandlerQueryFields( 'ar' ),
165 $this->getNewActorQueryFields( 'ar' ),
166 $this->getNewCommentQueryFields( 'ar' )
167 ),
168 'joins' => [
169 'comment_ar_comment'
170 => [ 'JOIN', 'comment_ar_comment.comment_id = ar_comment_id' ],
171 'actor_ar_user' => [ 'JOIN', 'actor_ar_user.actor_id = ar_actor' ],
172 ],
173 ]
174 ];
175 }
176
177 public function provideQueryInfo() {
178 // TODO: more option variations
179 yield 'MCR, page, user, comment, actor' => [
180 [
181 'wgContentHandlerUseDB' => true,
182 'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
183 ],
184 [ 'page', 'user' ],
185 [
186 'tables' => [
187 'revision',
188 'page',
189 'user',
190 'temp_rev_user' => 'revision_actor_temp',
191 'temp_rev_comment' => 'revision_comment_temp',
192 'actor_rev_user' => 'actor',
193 'comment_rev_comment' => 'comment',
194 ],
195 'fields' => array_merge(
196 $this->getRevisionQueryFields( false ),
197 $this->getPageQueryFields(),
198 $this->getUserQueryFields(),
199 $this->getNewActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
200 $this->getNewCommentQueryFields( 'rev' )
201 ),
202 'joins' => [
203 'page' => [ 'JOIN', [ 'page_id = rev_page' ] ],
204 'user' => [
205 'LEFT JOIN',
206 [ 'actor_rev_user.actor_user != 0', 'user_id = actor_rev_user.actor_user' ],
207 ],
208 'comment_rev_comment' => [
209 'JOIN',
210 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id',
211 ],
212 'actor_rev_user' => [
213 'JOIN',
214 'actor_rev_user.actor_id = temp_rev_user.revactor_actor',
215 ],
216 'temp_rev_user' => [ 'JOIN', 'temp_rev_user.revactor_rev = rev_id' ],
217 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
218 'temp_rev_user' => [ 'JOIN', 'temp_rev_user.revactor_rev = rev_id' ],
219 'actor_rev_user' => [ 'JOIN', 'actor_rev_user.actor_id = temp_rev_user.revactor_actor' ],
220 ],
221 ]
222 ];
223 yield 'MCR read-new, page, user, comment, actor' => [
224 [
225 'wgContentHandlerUseDB' => true,
226 'wgMultiContentRevisionSchemaMigrationStage'
227 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
228 ],
229 [ 'page', 'user' ],
230 [
231 'tables' => [
232 'revision',
233 'page',
234 'user',
235 'temp_rev_user' => 'revision_actor_temp',
236 'temp_rev_comment' => 'revision_comment_temp',
237 'actor_rev_user' => 'actor',
238 'comment_rev_comment' => 'comment',
239 ],
240 'fields' => array_merge(
241 $this->getRevisionQueryFields( false ),
242 $this->getPageQueryFields(),
243 $this->getUserQueryFields(),
244 $this->getNewActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
245 $this->getNewCommentQueryFields( 'rev' )
246 ),
247 'joins' => [
248 'page' => [ 'JOIN', [ 'page_id = rev_page' ] ],
249 'user' => [
250 'LEFT JOIN',
251 [
252 'actor_rev_user.actor_user != 0',
253 'user_id = actor_rev_user.actor_user',
254 ]
255 ],
256 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
257 'comment_rev_comment'
258 => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
259 'temp_rev_user' => [ 'JOIN', 'temp_rev_user.revactor_rev = rev_id' ],
260 'actor_rev_user' => [ 'JOIN', 'actor_rev_user.actor_id = temp_rev_user.revactor_actor' ],
261 ],
262 ]
263 ];
264 yield 'MCR read-new' => [
265 [
266 'wgContentHandlerUseDB' => true,
267 'wgMultiContentRevisionSchemaMigrationStage'
268 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
269 ],
270 [ 'page', 'user' ],
271 [
272 'tables' => [
273 'revision',
274 'page',
275 'user',
276 'temp_rev_user' => 'revision_actor_temp',
277 'temp_rev_comment' => 'revision_comment_temp',
278 'actor_rev_user' => 'actor',
279 'comment_rev_comment' => 'comment',
280 ],
281 'fields' => array_merge(
282 $this->getRevisionQueryFields( false ),
283 $this->getPageQueryFields(),
284 $this->getUserQueryFields(),
285 $this->getNewActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
286 $this->getNewCommentQueryFields( 'rev' )
287 ),
288 'joins' => [
289 'page' => [ 'JOIN', [ 'page_id = rev_page' ] ],
290 'user' => [
291 'LEFT JOIN',
292 [
293 'actor_rev_user.actor_user != 0',
294 'user_id = actor_rev_user.actor_user'
295 ]
296 ],
297 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
298 'comment_rev_comment'
299 => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
300 'temp_rev_user' => [ 'JOIN', 'temp_rev_user.revactor_rev = rev_id' ],
301 'actor_rev_user' => [ 'JOIN', 'actor_rev_user.actor_id = temp_rev_user.revactor_actor' ],
302 ],
303 ]
304 ];
305 yield 'MCR write-both/read-old' => [
306 [
307 'wgContentHandlerUseDB' => true,
308 'wgMultiContentRevisionSchemaMigrationStage'
309 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
310 ],
311 [],
312 [
313 'tables' => [
314 'revision',
315 'temp_rev_comment' => 'revision_comment_temp',
316 'comment_rev_comment' => 'comment',
317 'temp_rev_user' => 'revision_actor_temp',
318 'actor_rev_user' => 'actor',
319 ],
320 'fields' => array_merge(
321 $this->getRevisionQueryFields( true ),
322 $this->getContentHandlerQueryFields( 'rev' ),
323 $this->getNewActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
324 $this->getNewCommentQueryFields( 'rev' )
325 ),
326 'joins' => [
327 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
328 'comment_rev_comment'
329 => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
330 'temp_rev_user' => [ 'JOIN', 'temp_rev_user.revactor_rev = rev_id' ],
331 'actor_rev_user' => [ 'JOIN', 'actor_rev_user.actor_id = temp_rev_user.revactor_actor' ],
332 ],
333 ]
334 ];
335 yield 'MCR write-both/read-old, page, user' => [
336 [
337 'wgContentHandlerUseDB' => true,
338 'wgMultiContentRevisionSchemaMigrationStage'
339 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
340 ],
341 [ 'page', 'user' ],
342 [
343 'tables' => [
344 'revision',
345 'page',
346 'user',
347 'temp_rev_comment' => 'revision_comment_temp',
348 'comment_rev_comment' => 'comment',
349 'temp_rev_user' => 'revision_actor_temp',
350 'actor_rev_user' => 'actor',
351 ],
352 'fields' => array_merge(
353 $this->getRevisionQueryFields( true ),
354 $this->getContentHandlerQueryFields( 'rev' ),
355 $this->getUserQueryFields(),
356 $this->getPageQueryFields(),
357 $this->getNewActorQueryFields( 'rev', 'temp_rev_user.revactor_actor' ),
358 $this->getNewCommentQueryFields( 'rev' )
359 ),
360 'joins' => [
361 'page' => [ 'JOIN', [ 'page_id = rev_page' ] ],
362 'user' => [
363 'LEFT JOIN',
364 [
365 'actor_rev_user.actor_user != 0',
366 'user_id = actor_rev_user.actor_user',
367 ]
368 ],
369 'temp_rev_comment' => [ 'JOIN', 'temp_rev_comment.revcomment_rev = rev_id' ],
370 'comment_rev_comment'
371 => [ 'JOIN', 'comment_rev_comment.comment_id = temp_rev_comment.revcomment_comment_id' ],
372 'temp_rev_user' => [ 'JOIN', 'temp_rev_user.revactor_rev = rev_id' ],
373 'actor_rev_user' => [ 'JOIN', 'actor_rev_user.actor_id = temp_rev_user.revactor_actor' ],
374 ],
375 ]
376 ];
377 }
378
379 public function provideSlotsQueryInfo() {
380 yield 'MCR, no options' => [
381 [
382 'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
383 ],
384 [],
385 [
386 'tables' => [
387 'slots'
388 ],
389 'fields' => [
390 'slot_revision_id',
391 'slot_content_id',
392 'slot_origin',
393 'slot_role_id',
394 ],
395 'joins' => [],
396 ]
397 ];
398 yield 'MCR, role option' => [
399 [
400 'wgMultiContentRevisionSchemaMigrationStage' => SCHEMA_COMPAT_NEW,
401 ],
402 [ 'role' ],
403 [
404 'tables' => [
405 'slots',
406 'slot_roles',
407 ],
408 'fields' => [
409 'slot_revision_id',
410 'slot_content_id',
411 'slot_origin',
412 'slot_role_id',
413 'role_name',
414 ],
415 'joins' => [
416 'slot_roles' => [ 'LEFT JOIN', [ 'slot_role_id = role_id' ] ],
417 ],
418 ]
419 ];
420 yield 'MCR read-new, content option' => [
421 [
422 'wgMultiContentRevisionSchemaMigrationStage'
423 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
424 ],
425 [ 'content' ],
426 [
427 'tables' => [
428 'slots',
429 'content',
430 ],
431 'fields' => [
432 'slot_revision_id',
433 'slot_content_id',
434 'slot_origin',
435 'slot_role_id',
436 'content_size',
437 'content_sha1',
438 'content_address',
439 'content_model',
440 ],
441 'joins' => [
442 'content' => [ 'JOIN', [ 'slot_content_id = content_id' ] ],
443 ],
444 ]
445 ];
446 yield 'MCR read-new, content and model options' => [
447 [
448 'wgMultiContentRevisionSchemaMigrationStage'
449 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW,
450 ],
451 [ 'content', 'model' ],
452 [
453 'tables' => [
454 'slots',
455 'content',
456 'content_models',
457 ],
458 'fields' => [
459 'slot_revision_id',
460 'slot_content_id',
461 'slot_origin',
462 'slot_role_id',
463 'content_size',
464 'content_sha1',
465 'content_address',
466 'content_model',
467 'model_name',
468 ],
469 'joins' => [
470 'content' => [ 'JOIN', [ 'slot_content_id = content_id' ] ],
471 'content_models' => [ 'LEFT JOIN', [ 'content_model = model_id' ] ],
472 ],
473 ]
474 ];
475
476 $db = wfGetDB( DB_REPLICA );
477
478 yield 'MCR write-both/read-old' => [
479 [
480 'wgMultiContentRevisionSchemaMigrationStage'
481 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
482 ],
483 [],
484 [
485 'tables' => [
486 'revision',
487 ],
488 'fields' => array_merge(
489 [
490 'slot_revision_id' => 'rev_id',
491 'slot_content_id' => 'NULL',
492 'slot_origin' => 'rev_id',
493 'role_name' => $db->addQuotes( SlotRecord::MAIN ),
494 ]
495 ),
496 'joins' => [],
497 ]
498 ];
499 yield 'MCR write-both/read-old, content' => [
500 [
501 'wgMultiContentRevisionSchemaMigrationStage'
502 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
503 ],
504 [ 'content' ],
505 [
506 'tables' => [
507 'revision',
508 ],
509 'fields' => array_merge(
510 [
511 'slot_revision_id' => 'rev_id',
512 'slot_content_id' => 'NULL',
513 'slot_origin' => 'rev_id',
514 'role_name' => $db->addQuotes( SlotRecord::MAIN ),
515 'content_size' => 'rev_len',
516 'content_sha1' => 'rev_sha1',
517 'content_address' => $db->buildConcat( [
518 $db->addQuotes( 'tt:' ), 'rev_text_id' ] ),
519 'rev_text_id' => 'rev_text_id',
520 'model_name' => 'rev_content_model',
521 ]
522 ),
523 'joins' => [],
524 ]
525 ];
526 yield 'MCR write-both/read-old, content, model, role' => [
527 [
528 'wgMultiContentRevisionSchemaMigrationStage'
529 => SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD,
530 ],
531 [ 'content', 'model', 'role' ],
532 [
533 'tables' => [
534 'revision',
535 ],
536 'fields' => array_merge(
537 [
538 'slot_revision_id' => 'rev_id',
539 'slot_content_id' => 'NULL',
540 'slot_origin' => 'rev_id',
541 'role_name' => $db->addQuotes( SlotRecord::MAIN ),
542 'content_size' => 'rev_len',
543 'content_sha1' => 'rev_sha1',
544 'content_address' => $db->buildConcat( [
545 $db->addQuotes( 'tt:' ), 'rev_text_id' ] ),
546 'rev_text_id' => 'rev_text_id',
547 'model_name' => 'rev_content_model',
548 ]
549 ),
550 'joins' => [],
551 ]
552 ];
553 }
554
555 /**
556 * @covers Revision::getArchiveQueryInfo
557 * @dataProvider provideArchiveQueryInfo
558 */
559 public function testRevisionGetArchiveQueryInfo( $migrationStageSettings, $expected ) {
560 $this->setMwGlobals( $migrationStageSettings );
561
562 $queryInfo = Revision::getArchiveQueryInfo();
563 $this->assertQueryInfoEquals( $expected, $queryInfo );
564 }
565
566 /**
567 * @covers Revision::getQueryInfo
568 * @dataProvider provideQueryInfo
569 */
570 public function testRevisionGetQueryInfo( $migrationStageSettings, $options, $expected ) {
571 $this->setMwGlobals( $migrationStageSettings );
572
573 $queryInfo = Revision::getQueryInfo( $options );
574 $this->assertQueryInfoEquals( $expected, $queryInfo );
575 }
576
577 /**
578 * @dataProvider provideQueryInfo
579 * @covers \MediaWiki\Revision\RevisionStore::getQueryInfo
580 */
581 public function testRevisionStoreGetQueryInfo( $migrationStageSettings, $options, $expected ) {
582 $this->setMwGlobals( $migrationStageSettings );
583
584 $store = MediaWikiServices::getInstance()->getRevisionStore();
585
586 $queryInfo = $store->getQueryInfo( $options );
587 $this->assertQueryInfoEquals( $expected, $queryInfo );
588 }
589
590 /**
591 * @dataProvider provideSlotsQueryInfo
592 * @covers \MediaWiki\Revision\RevisionStore::getSlotsQueryInfo
593 */
594 public function testRevisionStoreGetSlotsQueryInfo(
595 $migrationStageSettings,
596 $options,
597 $expected
598 ) {
599 $this->setMwGlobals( $migrationStageSettings );
600
601 $store = MediaWikiServices::getInstance()->getRevisionStore();
602
603 $queryInfo = $store->getSlotsQueryInfo( $options );
604 $this->assertQueryInfoEquals( $expected, $queryInfo );
605 }
606
607 /**
608 * @dataProvider provideArchiveQueryInfo
609 * @covers \MediaWiki\Revision\RevisionStore::getArchiveQueryInfo
610 */
611 public function testRevisionStoreGetArchiveQueryInfo( $migrationStageSettings, $expected ) {
612 $this->setMwGlobals( $migrationStageSettings );
613
614 $store = MediaWikiServices::getInstance()->getRevisionStore();
615
616 $queryInfo = $store->getArchiveQueryInfo();
617 $this->assertQueryInfoEquals( $expected, $queryInfo );
618 }
619
620 private function assertQueryInfoEquals( $expected, $queryInfo ) {
621 $this->assertArrayEqualsIgnoringIntKeyOrder(
622 $expected['tables'],
623 $queryInfo['tables'],
624 'tables'
625 );
626 $this->assertArrayEqualsIgnoringIntKeyOrder(
627 $expected['fields'],
628 $queryInfo['fields'],
629 'fields'
630 );
631 $this->assertArrayEqualsIgnoringIntKeyOrder(
632 $expected['joins'],
633 $queryInfo['joins'],
634 'joins'
635 );
636 }
637
638 /**
639 * Assert that the two arrays passed are equal, ignoring the order of the values that integer
640 * keys.
641 *
642 * Note: Failures of this assertion can be slightly confusing as the arrays are actually
643 * split into a string key array and an int key array before assertions occur.
644 *
645 * @param array $expected
646 * @param array $actual
647 */
648 private function assertArrayEqualsIgnoringIntKeyOrder(
649 array $expected,
650 array $actual,
651 $message = null
652 ) {
653 $this->objectAssociativeSort( $expected );
654 $this->objectAssociativeSort( $actual );
655
656 // Separate the int key values from the string key values so that assertion failures are
657 // easier to understand.
658 $expectedIntKeyValues = [];
659 $actualIntKeyValues = [];
660
661 // Remove all int keys and re add them at the end after sorting by value
662 // This will result in all int keys being in the same order with same ints at the end of
663 // the array
664 foreach ( $expected as $key => $value ) {
665 if ( is_int( $key ) ) {
666 unset( $expected[$key] );
667 $expectedIntKeyValues[] = $value;
668 }
669 }
670 foreach ( $actual as $key => $value ) {
671 if ( is_int( $key ) ) {
672 unset( $actual[$key] );
673 $actualIntKeyValues[] = $value;
674 }
675 }
676
677 $this->objectAssociativeSort( $expected );
678 $this->objectAssociativeSort( $actual );
679
680 $this->objectAssociativeSort( $expectedIntKeyValues );
681 $this->objectAssociativeSort( $actualIntKeyValues );
682
683 $this->assertEquals( $expected, $actual, $message );
684 $this->assertEquals( $expectedIntKeyValues, $actualIntKeyValues, $message );
685 }
686
687 }