Fix unnecessary_allof_wrapper_modern conflict on canonicalise

[jviotti]

Signed-off-by: Juan Cruz Viotti jv@jviotti.com

[jviotti]

These are the two times the rule gets called for the first test case:

{
  "$schema": "https://json-schema.org/draft/2020-12/schema",
  "allOf": [
    {
      "type": "number"
    },
    {
      "type": "string"
    }
  ]
}
{
  "$schema": "https://json-schema.org/draft/2020-12/schema",
  "type": "number",
  "allOf": [
    {
      "type": "string",
      "minLength": 0
    }
  ],
  "multipleOf": 1
}

I think the problem is that we record what rule was processed given the pointer of the schema, but when i.e. we remove an entry of an array like allOf, we run the same rule against a different schema, but the index is the same, so it fails.

[jviotti]

The first issue was fixed by this: #1889

[github-actions]

Benchmark (linux/llvm)

Benchmark suite	Current: 6a370de	Previous: 3cf52e7	Ratio
Regex_Lower_S_Or_Upper_S_Asterisk	2.4907800738928736 ns/iter	2.4956216126528545 ns/iter	1.00
Regex_Caret_Lower_S_Or_Upper_S_Asterisk_Dollar	2.4875611303342775 ns/iter	2.4868430570761655 ns/iter	1.00
Regex_Period_Asterisk	2.4873944260063943 ns/iter	2.4870982684166907 ns/iter	1.00
Regex_Group_Period_Asterisk_Group	2.497741986414784 ns/iter	2.486762644113129 ns/iter	1.00
Regex_Period_Plus	2.4881897768465278 ns/iter	2.7973412873078813 ns/iter	0.89
Regex_Period	2.489537360079518 ns/iter	2.4868687376264216 ns/iter	1.00
Regex_Caret_Period_Plus_Dollar	2.5067127224073626 ns/iter	2.4887315602500037 ns/iter	1.01
Regex_Caret_Group_Period_Plus_Group_Dollar	2.4875496805537085 ns/iter	2.4903696989561817 ns/iter	1.00
Regex_Caret_Period_Asterisk_Dollar	2.4868526370905513 ns/iter	2.506698816289164 ns/iter	0.99
Regex_Caret_Group_Period_Asterisk_Group_Dollar	2.4869333387687265 ns/iter	2.488775185185442 ns/iter	1.00
Regex_Caret_X_Hyphen	6.529100417402702 ns/iter	13.052668926569066 ns/iter	0.50
Regex_Period_Md_Dollar	77.98481295020505 ns/iter	79.78866974291734 ns/iter	0.98
Regex_Caret_Slash_Period_Asterisk	5.90307499991031 ns/iter	5.9092476569725525 ns/iter	1.00
Regex_Caret_Period_Range_Dollar	2.796749645838987 ns/iter	2.8003171611649216 ns/iter	1.00
Regex_Nested_Backtrack	490.1193989428448 ns/iter	475.30896086481044 ns/iter	1.03
JSON_Array_Of_Objects_Unique	396.7570052637574 ns/iter	397.3808128303995 ns/iter	1.00
JSON_Parse_1	29277.364111132574 ns/iter	28632.492701780266 ns/iter	1.02
JSON_Fast_Hash_Helm_Chart_Lock	56.12413480106233 ns/iter	56.22747680821034 ns/iter	1.00
JSON_Equality_Helm_Chart_Lock	154.69261609811215 ns/iter	158.58456916254053 ns/iter	0.98
JSON_String_Equal/10	6.227033602675294 ns/iter	6.988975417134388 ns/iter	0.89
JSON_String_Equal/100	6.847324651040691 ns/iter	6.542298073337761 ns/iter	1.05
JSON_String_Equal_Small_By_Perfect_Hash/10	0.9343465641978184 ns/iter	0.933519493141343 ns/iter	1.00
JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10	14.60282074194717 ns/iter	14.648244055780674 ns/iter	1.00
JSON_String_Fast_Hash/10	2.1758938187241563 ns/iter	2.175450550040816 ns/iter	1.00
JSON_String_Fast_Hash/100	2.1761293453793593 ns/iter	2.1770071428399485 ns/iter	1.00
JSON_String_Key_Hash/10	2.6653498819593966 ns/iter	2.664934724642309 ns/iter	1.00
JSON_String_Key_Hash/100	9.084052902106366 ns/iter	9.053266864666863 ns/iter	1.00
JSON_Object_Defines_Miss_Same_Length	3.7327312750086747 ns/iter	3.736634648284298 ns/iter	1.00
JSON_Object_Defines_Miss_Too_Small	3.7352683571002627 ns/iter	3.738530605491043 ns/iter	1.00
JSON_Object_Defines_Miss_Too_Large	3.7346681474497236 ns/iter	3.735040289568786 ns/iter	1.00
Pointer_Object_Traverse	46.0794086548384 ns/iter	46.192986303081426 ns/iter	1.00
Pointer_Object_Try_Traverse	53.25954369578965 ns/iter	53.22245452714434 ns/iter	1.00
Pointer_Push_Back_Pointer_To_Weak_Pointer	427.2829467155864 ns/iter	305.34592360723207 ns/iter	1.40
Schema_Frame_OMC_Instances	188580507.6666429 ns/iter	176915367.50000125 ns/iter	1.07
Schema_Frame_OMC_References	105831750.85714304 ns/iter	100751689.99999765 ns/iter	1.05
Schema_Frame_OMC_Locations	101707521.28570776 ns/iter	95263762.85714377 ns/iter	1.07
Schema_Bundle_Meta_2020_12	6366016.458714679 ns/iter	6360970.385319934 ns/iter	1.00

This comment was automatically generated by workflow using github-action-benchmark.

[github-actions]

Benchmark (macos/llvm)

Benchmark suite	Current: 6a370de	Previous: 3cf52e7	Ratio
Regex_Lower_S_Or_Upper_S_Asterisk	2.607674495863739 ns/iter	1.7306843512276961 ns/iter	1.51
Regex_Caret_Lower_S_Or_Upper_S_Asterisk_Dollar	1.8974804504709792 ns/iter	1.7411812852388486 ns/iter	1.09
Regex_Period_Asterisk	1.77860617699228 ns/iter	1.7097185306635994 ns/iter	1.04
Regex_Group_Period_Asterisk_Group	1.7938561235148838 ns/iter	1.6808745038265294 ns/iter	1.07
Regex_Period_Plus	2.1262673711008846 ns/iter	2.02125877308536 ns/iter	1.05
Regex_Period	1.9458318592912107 ns/iter	1.9948030210134746 ns/iter	0.98
Regex_Caret_Period_Plus_Dollar	1.946390279776 ns/iter	2.0257275005953264 ns/iter	0.96
Regex_Caret_Group_Period_Plus_Group_Dollar	1.9439978069871402 ns/iter	2.122910748569451 ns/iter	0.92
Regex_Caret_Period_Asterisk_Dollar	1.625868486116892 ns/iter	1.625375667272039 ns/iter	1.00
Regex_Caret_Group_Period_Asterisk_Group_Dollar	1.6195116927275892 ns/iter	1.6256739754481933 ns/iter	1.00
Regex_Caret_X_Hyphen	6.784701971841959 ns/iter	6.760238840996944 ns/iter	1.00
Regex_Period_Md_Dollar	69.25345537720757 ns/iter	74.24113878794479 ns/iter	0.93
Regex_Caret_Slash_Period_Asterisk	5.190778709216863 ns/iter	5.107490058407915 ns/iter	1.02
Regex_Caret_Period_Range_Dollar	2.266318722818466 ns/iter	2.237600816730563 ns/iter	1.01
Regex_Nested_Backtrack	730.4571391410313 ns/iter	743.2817423060328 ns/iter	0.98
JSON_Array_Of_Objects_Unique	344.60008788128715 ns/iter	343.00705298638957 ns/iter	1.00
JSON_Parse_1	22630.27176270018 ns/iter	19964.814590518192 ns/iter	1.13
JSON_Fast_Hash_Helm_Chart_Lock	51.18192020091472 ns/iter	49.061785801461355 ns/iter	1.04
JSON_Equality_Helm_Chart_Lock	127.68026870623282 ns/iter	138.04754707451394 ns/iter	0.92
JSON_String_Equal/10	7.756742602947903 ns/iter	8.161568419990521 ns/iter	0.95
JSON_String_Equal/100	6.4640578791427 ns/iter	7.054087527089809 ns/iter	0.92
JSON_String_Equal_Small_By_Perfect_Hash/10	0.32054147865590754 ns/iter	0.34397893337075675 ns/iter	0.93
JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10	2.9864740535221426 ns/iter	3.1626371853063233 ns/iter	0.94
JSON_String_Fast_Hash/10	1.5857239322155996 ns/iter	1.7178550648200308 ns/iter	0.92
JSON_String_Fast_Hash/100	1.9059743331661665 ns/iter	1.9611724664168542 ns/iter	0.97
JSON_String_Key_Hash/10	1.2759126211234977 ns/iter	1.3581890715932412 ns/iter	0.94
JSON_String_Key_Hash/100	2.0256102843397117 ns/iter	2.0311062097195083 ns/iter	1.00
JSON_Object_Defines_Miss_Same_Length	2.5500673808654084 ns/iter	2.778246382583226 ns/iter	0.92
JSON_Object_Defines_Miss_Too_Small	2.5544207747520913 ns/iter	2.540317457890146 ns/iter	1.01
JSON_Object_Defines_Miss_Too_Large	2.576233123740691 ns/iter	2.5576207969511056 ns/iter	1.01
Pointer_Object_Traverse	15.777783508556213 ns/iter	15.774010537829502 ns/iter	1.00
Pointer_Object_Try_Traverse	20.905061919935026 ns/iter	20.206770916838146 ns/iter	1.03
Pointer_Push_Back_Pointer_To_Weak_Pointer	172.54295560677784 ns/iter	173.81074422782802 ns/iter	0.99
Schema_Frame_OMC_Instances	156535958.25000367 ns/iter	154747499.99998495 ns/iter	1.01
Schema_Frame_OMC_References	90479059.57140756 ns/iter	87551755.8571346 ns/iter	1.03
Schema_Frame_OMC_Locations	85480856.55555345 ns/iter	84248848.87499218 ns/iter	1.01
Schema_Bundle_Meta_2020_12	4586136.269732845 ns/iter	4721162.623377643 ns/iter	0.97

This comment was automatically generated by workflow using github-action-benchmark.

[github-actions]

Benchmark (windows/msvc)

Benchmark suite	Current: 6a370de	Previous: 3cf52e7	Ratio
Regex_Lower_S_Or_Upper_S_Asterisk	2.7481769184159166 ns/iter	2.777837185020399 ns/iter	0.99
Regex_Caret_Lower_S_Or_Upper_S_Asterisk_Dollar	3.1112638392859338 ns/iter	3.0981662904933938 ns/iter	1.00
Regex_Period_Asterisk	2.80461696303364 ns/iter	2.790166338040856 ns/iter	1.01
Regex_Group_Period_Asterisk_Group	2.7369381448777665 ns/iter	2.7613816059097998 ns/iter	0.99
Regex_Period_Plus	2.7978030791082764 ns/iter	2.7983093291076857 ns/iter	1.00
Regex_Period	2.7896042398258194 ns/iter	2.8075182576755053 ns/iter	0.99
Regex_Caret_Period_Plus_Dollar	2.791014507682426 ns/iter	2.791011046615262 ns/iter	1.00
Regex_Caret_Group_Period_Plus_Group_Dollar	2.8140428558865294 ns/iter	2.792647296613294 ns/iter	1.01
Regex_Caret_Period_Asterisk_Dollar	2.791457275539807 ns/iter	2.7924299987538057 ns/iter	1.00
Regex_Caret_Group_Period_Asterisk_Group_Dollar	2.7092144841883425 ns/iter	2.715464640432383 ns/iter	1.00
Regex_Caret_X_Hyphen	5.982231249999716 ns/iter	5.8903517857150485 ns/iter	1.02
Regex_Period_Md_Dollar	146.29549107141315 ns/iter	146.81488839285757 ns/iter	1.00
Regex_Caret_Slash_Period_Asterisk	5.880426785714527 ns/iter	5.8793910714293975 ns/iter	1.00
Regex_Caret_Period_Range_Dollar	3.112561607142794 ns/iter	3.098739732142316 ns/iter	1.00
Regex_Nested_Backtrack	585.3433928571405 ns/iter	586.0179464284394 ns/iter	1.00
JSON_Array_Of_Objects_Unique	451.3048124999841 ns/iter	444.11740336144106 ns/iter	1.02
JSON_Parse_1	77201.39508928168 ns/iter	75299.36383926992 ns/iter	1.03
JSON_Fast_Hash_Helm_Chart_Lock	65.30999107142627 ns/iter	70.14445535714589 ns/iter	0.93
JSON_Equality_Helm_Chart_Lock	218.48659391891235 ns/iter	211.72440625001346 ns/iter	1.03
JSON_String_Equal/10	8.979246388486173 ns/iter	8.98482451346013 ns/iter	1.00
JSON_String_Equal/100	10.33224687500045 ns/iter	10.22989375000094 ns/iter	1.01
JSON_String_Equal_Small_By_Perfect_Hash/10	2.165835312500164 ns/iter	2.167190937500152 ns/iter	1.00
JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10	12.701155357143127 ns/iter	12.702623214283092 ns/iter	1.00
JSON_String_Fast_Hash/10	3.965822953510362 ns/iter	3.7093896362335674 ns/iter	1.07
JSON_String_Fast_Hash/100	3.8035667032205467 ns/iter	3.708778744205043 ns/iter	1.03
JSON_String_Key_Hash/10	3.717011243362391 ns/iter	3.713526957654111 ns/iter	1.00
JSON_String_Key_Hash/100	13.609110714284611 ns/iter	13.609580966028625 ns/iter	1.00
JSON_Object_Defines_Miss_Same_Length	4.644043537151897 ns/iter	4.650506260380812 ns/iter	1.00
JSON_Object_Defines_Miss_Too_Small	3.726568386202091 ns/iter	3.7157373147936528 ns/iter	1.00
JSON_Object_Defines_Miss_Too_Large	4.819136394685376 ns/iter	4.702751898372267 ns/iter	1.02
Pointer_Object_Traverse	49.89501999999675 ns/iter	50.20474000000377 ns/iter	0.99
Pointer_Object_Try_Traverse	66.02091964285454 ns/iter	65.87872321428482 ns/iter	1.00
Pointer_Push_Back_Pointer_To_Weak_Pointer	155.89424107143353 ns/iter	155.77191964284106 ns/iter	1.00
Schema_Frame_OMC_Instances	390757550.0000462 ns/iter	395969250.0000074 ns/iter	0.99
Schema_Frame_OMC_References	241377099.99998453 ns/iter	243259300.00001487 ns/iter	0.99
Schema_Frame_OMC_Locations	228274666.66664502 ns/iter	231273399.99996364 ns/iter	0.99
Schema_Bundle_Meta_2020_12	15038391.11111726 ns/iter	14999285.999974744 ns/iter	1.00

This comment was automatically generated by workflow using github-action-benchmark.

[github-actions]

Benchmark (linux/gcc)

Benchmark suite	Current: 6a370de	Previous: 3cf52e7	Ratio
Schema_Frame_OMC_Instances	177864112.2500062 ns/iter	176843249.99999034 ns/iter	1.01
Schema_Frame_OMC_References	99002601.00000325 ns/iter	101295937.85713302 ns/iter	0.98
Schema_Frame_OMC_Locations	93995492.42857574 ns/iter	96119932.42856443 ns/iter	0.98
Schema_Bundle_Meta_2020_12	6311538.818180328 ns/iter	6311487.518190584 ns/iter	1.00
Pointer_Object_Traverse	49.56087188248076 ns/iter	47.00017057709685 ns/iter	1.05
Pointer_Object_Try_Traverse	23.060487327529057 ns/iter	23.036587799320056 ns/iter	1.00
Pointer_Push_Back_Pointer_To_Weak_Pointer	178.69315930855262 ns/iter	185.64155417007447 ns/iter	0.96
JSON_Array_Of_Objects_Unique	424.8806288706087 ns/iter	399.238295285275 ns/iter	1.06
JSON_Parse_1	31527.461091493136 ns/iter	31190.79991088725 ns/iter	1.01
JSON_Fast_Hash_Helm_Chart_Lock	71.7590168914539 ns/iter	71.73071057084108 ns/iter	1.00
JSON_Equality_Helm_Chart_Lock	145.2359845040192 ns/iter	146.51129336933715 ns/iter	0.99
JSON_String_Equal/10	6.0288664835747 ns/iter	6.961547006174204 ns/iter	0.87
JSON_String_Equal/100	6.656918057157004 ns/iter	7.584352945009664 ns/iter	0.88
JSON_String_Equal_Small_By_Perfect_Hash/10	0.6244182018707172 ns/iter	0.6243295680203543 ns/iter	1.00
JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10	19.617427959161102 ns/iter	19.582621213012075 ns/iter	1.00
JSON_String_Fast_Hash/10	1.244152861855586 ns/iter	1.2432516200350354 ns/iter	1.00
JSON_String_Fast_Hash/100	1.2447852323976267 ns/iter	1.245758849473837 ns/iter	1.00
JSON_String_Key_Hash/10	1.2447487919840936 ns/iter	1.2443695850866594 ns/iter	1.00
JSON_String_Key_Hash/100	12.443036850128616 ns/iter	12.42493205435366 ns/iter	1.00
JSON_Object_Defines_Miss_Same_Length	2.490501187492667 ns/iter	2.488390165952967 ns/iter	1.00
JSON_Object_Defines_Miss_Too_Small	2.800069307718804 ns/iter	2.7979368444447927 ns/iter	1.00
JSON_Object_Defines_Miss_Too_Large	2.489564947460381 ns/iter	2.4878539235167776 ns/iter	1.00
Regex_Lower_S_Or_Upper_S_Asterisk	3.1094506134043756 ns/iter	3.107241305034267 ns/iter	1.00
Regex_Caret_Lower_S_Or_Upper_S_Asterisk_Dollar	2.8028847079717676 ns/iter	2.7990071071075913 ns/iter	1.00
Regex_Period_Asterisk	2.800190078921083 ns/iter	2.797802224420159 ns/iter	1.00
Regex_Group_Period_Asterisk_Group	2.8005472684713677 ns/iter	2.796839692600424 ns/iter	1.00
Regex_Period_Plus	3.1096501284723908 ns/iter	3.1076944261411152 ns/iter	1.00
Regex_Period	3.1136628238870045 ns/iter	3.108405933332185 ns/iter	1.00
Regex_Caret_Period_Plus_Dollar	3.110945083962238 ns/iter	3.107608293060692 ns/iter	1.00
Regex_Caret_Group_Period_Plus_Group_Dollar	3.114907652330678 ns/iter	3.1092227928738723 ns/iter	1.00
Regex_Caret_Period_Asterisk_Dollar	4.041730541397297 ns/iter	4.0387058166082115 ns/iter	1.00
Regex_Caret_Group_Period_Asterisk_Group_Dollar	4.048050453525512 ns/iter	4.038498279463358 ns/iter	1.00
Regex_Caret_X_Hyphen	13.15518628759552 ns/iter	13.150418982218035 ns/iter	1.00
Regex_Period_Md_Dollar	89.76069759242891 ns/iter	89.42770329984604 ns/iter	1.00
Regex_Caret_Slash_Period_Asterisk	8.08652272123997 ns/iter	8.253566239909896 ns/iter	0.98
Regex_Caret_Period_Range_Dollar	4.0417789018078 ns/iter	3.418493261886126 ns/iter	1.18
Regex_Nested_Backtrack	818.7993288865893 ns/iter	817.7500102124926 ns/iter	1.00

This comment was automatically generated by workflow using github-action-benchmark.

[github-actions]

Benchmark (macos/gcc)

Benchmark suite	Current: 6a370de	Previous: 3cf52e7	Ratio
Regex_Lower_S_Or_Upper_S_Asterisk	2.020345273166098 ns/iter	1.9784294970564684 ns/iter	1.02
Regex_Caret_Lower_S_Or_Upper_S_Asterisk_Dollar	1.9762949587155458 ns/iter	1.895234567919055 ns/iter	1.04
Regex_Period_Asterisk	2.0553601319090067 ns/iter	1.8787277226375794 ns/iter	1.09
Regex_Group_Period_Asterisk_Group	2.3471815421374442 ns/iter	2.2135212620849662 ns/iter	1.06
Regex_Period_Plus	1.9835468049776532 ns/iter	1.8861107928899867 ns/iter	1.05
Regex_Period	2.1524233116128397 ns/iter	1.8847590855426641 ns/iter	1.14
Regex_Caret_Period_Plus_Dollar	2.0950359974339876 ns/iter	1.8862675167577818 ns/iter	1.11
Regex_Caret_Group_Period_Plus_Group_Dollar	2.226331761757349 ns/iter	1.8993472877707813 ns/iter	1.17
Regex_Caret_Period_Asterisk_Dollar	2.280136804731448 ns/iter	1.880771014954281 ns/iter	1.21
Regex_Caret_Group_Period_Asterisk_Group_Dollar	2.1567821460744776 ns/iter	1.8805136697874085 ns/iter	1.15
Regex_Caret_X_Hyphen	7.285999274764346 ns/iter	5.951109110415127 ns/iter	1.22
Regex_Period_Md_Dollar	97.98308218952967 ns/iter	66.82667375530885 ns/iter	1.47
Regex_Caret_Slash_Period_Asterisk	5.258593918794916 ns/iter	4.386610513484934 ns/iter	1.20
Regex_Caret_Period_Range_Dollar	2.1699686498741677 ns/iter	1.8895736153856433 ns/iter	1.15
Regex_Nested_Backtrack	1007.8395777234075 ns/iter	804.6481480896293 ns/iter	1.25
JSON_Array_Of_Objects_Unique	273.0954160360643 ns/iter	199.89182508424528 ns/iter	1.37
JSON_Parse_1	38712.17921444747 ns/iter	20911.110594059315 ns/iter	1.85
JSON_Fast_Hash_Helm_Chart_Lock	36.15338574249743 ns/iter	23.740822806739427 ns/iter	1.52
JSON_Equality_Helm_Chart_Lock	183.85276428231458 ns/iter	116.12281624727761 ns/iter	1.58
JSON_String_Equal/10	7.9913272660559995 ns/iter	5.406927796760666 ns/iter	1.48
JSON_String_Equal/100	8.068830726310605 ns/iter	5.051806816091856 ns/iter	1.60
JSON_String_Equal_Small_By_Perfect_Hash/10	1.1378979617345548 ns/iter	0.7446989103595533 ns/iter	1.53
JSON_String_Equal_Small_By_Runtime_Perfect_Hash/10	5.491345296838112 ns/iter	3.4476269139223557 ns/iter	1.59
JSON_String_Fast_Hash/10	2.79687511829998 ns/iter	1.891212484261444 ns/iter	1.48
JSON_String_Fast_Hash/100	2.8398198580449834 ns/iter	1.8924893852140365 ns/iter	1.50
JSON_String_Key_Hash/10	2.472124057775388 ns/iter	1.4336473815109392 ns/iter	1.72
JSON_String_Key_Hash/100	3.7927497048401566 ns/iter	2.5975255766588066 ns/iter	1.46
JSON_Object_Defines_Miss_Same_Length	2.744936006728597 ns/iter	1.775066657643974 ns/iter	1.55
JSON_Object_Defines_Miss_Too_Small	2.351565743039619 ns/iter	1.7760000861684346 ns/iter	1.32
JSON_Object_Defines_Miss_Too_Large	2.276797755356978 ns/iter	1.7760136393203405 ns/iter	1.28
Pointer_Object_Traverse	55.6503332404055 ns/iter	51.24339012809001 ns/iter	1.09
Pointer_Object_Try_Traverse	43.748623990629 ns/iter	36.10017023929025 ns/iter	1.21
Pointer_Push_Back_Pointer_To_Weak_Pointer	182.2370523481539 ns/iter	155.00994805506346 ns/iter	1.18
Schema_Frame_OMC_Instances	186685005.82377115 ns/iter	145500421.52404785 ns/iter	1.28
Schema_Frame_OMC_References	118291497.23052979 ns/iter	81672218.11082628 ns/iter	1.45
Schema_Frame_OMC_Locations	110666990.28015137 ns/iter	79080661.13789876 ns/iter	1.40
Schema_Bundle_Meta_2020_12	5503536.140831717 ns/iter	4882060.088120498 ns/iter	1.13

This comment was automatically generated by workflow using github-action-benchmark.