This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
File tree
15 files changed
+182
-116
lines changed- app/code/Magento
- CatalogSearch/Model
- Adapter/Mysql/Plugin/Aggregation/Category
- Search/FilterMapper
- Catalog
- Model
- Indexer/Category/Product
- Action
- Plugin
- ResourceModel
- Product
- Setup
- Test/Unit/Model/Indexer/Category/Product/Plugin
15 files changed
+182
-116
lines changedLines changed: 8 additions & 9 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
16 | 16 |
| |
17 | 17 |
| |
18 | 18 |
| |
19 |
| - | |
| 19 | + | |
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
| |||
40 | 40 |
| |
41 | 41 |
| |
42 | 42 |
| |
43 |
| - | |
44 | 43 |
| |
45 | 44 |
| |
46 | 45 |
| |
| |||
112 | 111 |
| |
113 | 112 |
| |
114 | 113 |
| |
115 |
| - | |
| 114 | + | |
116 | 115 |
| |
117 |
| - | |
| 116 | + | |
118 | 117 |
| |
119 | 118 |
| |
120 | 119 |
| |
| |||
133 | 132 |
| |
134 | 133 |
| |
135 | 134 |
| |
136 |
| - | |
| 135 | + | |
137 | 136 |
| |
138 | 137 |
| |
139 | 138 |
| |
140 | 139 |
| |
141 | 140 |
| |
142 | 141 |
| |
143 | 142 |
| |
144 |
| - | |
| 143 | + | |
145 | 144 |
| |
146 | 145 |
| |
147 | 146 |
| |
148 | 147 |
| |
149 | 148 |
| |
150 | 149 |
| |
151 | 150 |
| |
152 |
| - | |
| 151 | + | |
153 | 152 |
| |
154 | 153 |
| |
155 | 154 |
| |
| |||
222 | 221 |
| |
223 | 222 |
| |
224 | 223 |
| |
225 |
| - | |
226 |
| - | |
| 224 | + | |
| 225 | + | |
227 | 226 |
| |
228 | 227 |
| |
229 | 228 |
| |
|
Lines changed: 13 additions & 9 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
102 | 102 |
| |
103 | 103 |
| |
104 | 104 |
| |
105 |
| - | |
| 105 | + | |
106 | 106 |
| |
107 | 107 |
| |
108 | 108 |
| |
| |||
112 | 112 |
| |
113 | 113 |
| |
114 | 114 |
| |
115 |
| - | |
| 115 | + | |
116 | 116 |
| |
117 | 117 |
| |
118 | 118 |
| |
| |||
123 | 123 |
| |
124 | 124 |
| |
125 | 125 |
| |
126 |
| - | |
| 126 | + | |
127 | 127 |
| |
128 | 128 |
| |
129 | 129 |
| |
| |||
182 | 182 |
| |
183 | 183 |
| |
184 | 184 |
| |
185 |
| - | |
| 185 | + | |
186 | 186 |
| |
187 |
| - | |
| 187 | + | |
188 | 188 |
| |
189 |
| - | |
| 189 | + | |
190 | 190 |
| |
191 | 191 |
| |
192 | 192 |
| |
| |||
240 | 240 |
| |
241 | 241 |
| |
242 | 242 |
| |
| 243 | + | |
| 244 | + | |
243 | 245 |
| |
244 |
| - | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
245 | 249 |
| |
246 | 250 |
| |
247 | 251 |
| |
| |||
250 | 254 |
| |
251 | 255 |
| |
252 | 256 |
| |
253 |
| - | |
| 257 | + | |
254 | 258 |
| |
255 | 259 |
| |
256 | 260 |
| |
| |||
260 | 264 |
| |
261 | 265 |
| |
262 | 266 |
| |
263 |
| - | |
| 267 | + | |
264 | 268 |
| |
265 | 269 |
| |
266 | 270 |
| |
|
Lines changed: 7 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
13 |
| - | |
| 13 | + | |
14 | 14 |
| |
15 | 15 |
| |
16 | 16 |
| |
| |||
25 | 25 |
| |
26 | 26 |
| |
27 | 27 |
| |
28 |
| - | |
| 28 | + | |
29 | 29 |
| |
30 |
| - | |
| 30 | + | |
31 | 31 |
| |
32 | 32 |
| |
33 | 33 |
| |
34 |
| - | |
| 34 | + | |
35 | 35 |
| |
36 | 36 |
| |
37 | 37 |
| |
38 |
| - | |
| 38 | + | |
39 | 39 |
| |
40 | 40 |
| |
41 |
| - | |
| 41 | + | |
42 | 42 |
| |
43 | 43 |
| |
44 | 44 |
| |
| |||
98 | 98 |
| |
99 | 99 |
| |
100 | 100 |
| |
101 |
| - | |
| 101 | + | |
102 | 102 |
| |
103 | 103 |
| |
104 | 104 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
33 | 33 |
| |
34 | 34 |
| |
35 | 35 |
| |
36 |
| - | |
| 36 | + | |
37 | 37 |
| |
38 | 38 |
| |
39 | 39 |
| |
| |||
51 | 51 |
| |
52 | 52 |
| |
53 | 53 |
| |
54 |
| - | |
| 54 | + | |
55 | 55 |
| |
56 | 56 |
| |
57 | 57 |
|
Lines changed: 7 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
10 |
| - | |
11 |
| - | |
| 10 | + | |
12 | 11 |
| |
13 | 12 |
| |
14 | 13 |
| |
15 | 14 |
| |
16 |
| - | |
| 15 | + | |
17 | 16 |
| |
18 |
| - | |
| 17 | + | |
19 | 18 |
| |
20 | 19 |
| |
21 |
| - | |
| 20 | + | |
22 | 21 |
| |
23 | 22 |
| |
24 |
| - | |
| 23 | + | |
25 | 24 |
| |
26 |
| - | |
| 25 | + | |
27 | 26 |
| |
28 | 27 |
| |
29 | 28 |
| |
| |||
39 | 38 |
| |
40 | 39 |
| |
41 | 40 |
| |
42 |
| - | |
| 41 | + | |
43 | 42 |
| |
44 | 43 |
| |
45 | 44 |
| |
|
Lines changed: 67 additions & 39 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
4 | 4 |
| |
5 | 5 |
| |
6 | 6 |
| |
| 7 | + | |
7 | 8 |
| |
8 | 9 |
| |
9 |
| - | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
10 | 15 |
| |
11 |
| - | |
| 16 | + | |
12 | 17 |
| |
13 | 18 |
| |
14 |
| - | |
| 19 | + | |
15 | 20 |
| |
16 |
| - | |
| 21 | + | |
17 | 22 |
| |
18 | 23 |
| |
19 |
| - | |
| 24 | + | |
20 | 25 |
| |
21 |
| - | |
| 26 | + | |
22 | 27 |
| |
23 | 28 |
| |
24 |
| - | |
| 29 | + | |
25 | 30 |
| |
26 |
| - | |
| 31 | + | |
27 | 32 |
| |
28 | 33 |
| |
29 | 34 |
| |
30 | 35 |
| |
31 |
| - | |
32 |
| - | |
33 |
| - | |
34 |
| - | |
35 |
| - | |
36 |
| - | |
| 36 | + | |
37 | 37 |
| |
38 | 38 |
| |
39 |
| - | |
| 39 | + | |
40 | 40 |
| |
41 |
| - | |
| 41 | + | |
42 | 42 |
| |
43 | 43 |
| |
44 | 44 |
| |
45 | 45 |
| |
46 | 46 |
| |
47 | 47 |
| |
48 | 48 |
| |
49 |
| - | |
| 49 | + | |
| 50 | + | |
50 | 51 |
| |
51 | 52 |
| |
52 |
| - | |
| 53 | + | |
| 54 | + | |
53 | 55 |
| |
54 | 56 |
| |
55 |
| - | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
56 | 71 |
| |
57 | 72 |
| |
58 | 73 |
| |
| |||
76 | 91 |
| |
77 | 92 |
| |
78 | 93 |
| |
79 |
| - | |
80 |
| - | |
81 |
| - | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
82 | 97 |
| |
83 | 98 |
| |
84 | 99 |
| |
| |||
92 | 107 |
| |
93 | 108 |
| |
94 | 109 |
| |
95 |
| - | |
96 |
| - | |
| 110 | + | |
| 111 | + | |
97 | 112 |
| |
98 | 113 |
| |
99 | 114 |
| |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
100 | 129 |
| |
101 | 130 |
| |
102 | 131 |
| |
| |||
107 | 136 |
| |
108 | 137 |
| |
109 | 138 |
| |
110 |
| - | |
| 139 | + | |
111 | 140 |
| |
112 | 141 |
| |
113 |
| - | |
| 142 | + | |
114 | 143 |
| |
115 | 144 |
| |
116 | 145 |
| |
| |||
130 | 159 |
| |
131 | 160 |
| |
132 | 161 |
| |
133 |
| - | |
| 162 | + | |
134 | 163 |
| |
135 | 164 |
| |
136 | 165 |
| |
137 | 166 |
| |
138 | 167 |
| |
139 |
| - | |
| 168 | + | |
140 | 169 |
| |
141 |
| - | |
| 170 | + | |
142 | 171 |
| |
143 | 172 |
| |
144 | 173 |
| |
145 |
| - | |
| 174 | + | |
146 | 175 |
| |
147 | 176 |
| |
148 | 177 |
| |
149 |
| - | |
| 178 | + | |
150 | 179 |
| |
151 |
| - | |
| 180 | + | |
152 | 181 |
| |
153 |
| - | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
154 | 188 |
| |
155 | 189 |
| |
156 | 190 |
| |
| |||
162 | 196 |
| |
163 | 197 |
| |
164 | 198 |
| |
165 |
| - | |
166 |
| - | |
167 |
| - | |
168 |
| - | |
169 |
| - | |
170 |
| - | |
171 | 199 |
| |
172 | 200 |
| |
173 | 201 |
|
Lines changed: 7 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
13 |
| - | |
| 13 | + | |
14 | 14 |
| |
15 | 15 |
| |
16 | 16 |
| |
| |||
38 | 38 |
| |
39 | 39 |
| |
40 | 40 |
| |
41 |
| - | |
| 41 | + | |
42 | 42 |
| |
43 |
| - | |
| 43 | + | |
44 | 44 |
| |
45 | 45 |
| |
46 | 46 |
| |
47 | 47 |
| |
48 | 48 |
| |
49 |
| - | |
| 49 | + | |
50 | 50 |
| |
51 | 51 |
| |
52 | 52 |
| |
53 | 53 |
| |
54 | 54 |
| |
55 |
| - | |
| 55 | + | |
56 | 56 |
| |
57 | 57 |
| |
58 | 58 |
| |
59 |
| - | |
| 59 | + | |
60 | 60 |
| |
61 | 61 |
| |
62 | 62 |
| |
| |||
73 | 73 |
| |
74 | 74 |
| |
75 | 75 |
| |
76 |
| - | |
| 76 | + | |
77 | 77 |
| |
78 | 78 |
| |
79 | 79 |
| |
|
Lines changed: 8 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
10 |
| - | |
| 10 | + | |
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
| |||
85 | 85 |
| |
86 | 86 |
| |
87 | 87 |
| |
88 |
| - | |
| 88 | + | |
89 | 89 |
| |
90 |
| - | |
| 90 | + | |
91 | 91 |
| |
92 | 92 |
| |
93 | 93 |
| |
| |||
100 | 100 |
| |
101 | 101 |
| |
102 | 102 |
| |
103 |
| - | |
| 103 | + | |
104 | 104 |
| |
105 | 105 |
| |
106 | 106 |
| |
| |||
115 | 115 |
| |
116 | 116 |
| |
117 | 117 |
| |
118 |
| - | |
| 118 | + | |
119 | 119 |
| |
120 | 120 |
| |
121 | 121 |
| |
| |||
130 | 130 |
| |
131 | 131 |
| |
132 | 132 |
| |
133 |
| - | |
| 133 | + | |
134 | 134 |
| |
135 | 135 |
| |
136 | 136 |
| |
| |||
377 | 377 |
| |
378 | 378 |
| |
379 | 379 |
| |
380 |
| - | |
| 380 | + | |
381 | 381 |
| |
382 | 382 |
| |
383 | 383 |
| |
| |||
411 | 411 |
| |
412 | 412 |
| |
413 | 413 |
| |
414 |
| - | |
| 414 | + | |
415 | 415 |
| |
416 | 416 |
| |
417 | 417 |
| |
|
Lines changed: 8 additions & 8 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
21 |
| - | |
| 21 | + | |
22 | 22 |
| |
23 | 23 |
| |
24 | 24 |
| |
| |||
274 | 274 |
| |
275 | 275 |
| |
276 | 276 |
| |
277 |
| - | |
| 277 | + | |
278 | 278 |
| |
279 |
| - | |
| 279 | + | |
280 | 280 |
| |
281 | 281 |
| |
282 | 282 |
| |
| |||
303 | 303 |
| |
304 | 304 |
| |
305 | 305 |
| |
306 |
| - | |
| 306 | + | |
307 | 307 |
| |
308 | 308 |
| |
309 | 309 |
| |
| |||
330 | 330 |
| |
331 | 331 |
| |
332 | 332 |
| |
333 |
| - | |
| 333 | + | |
334 | 334 |
| |
335 | 335 |
| |
336 | 336 |
| |
| |||
360 | 360 |
| |
361 | 361 |
| |
362 | 362 |
| |
363 |
| - | |
| 363 | + | |
364 | 364 |
| |
365 | 365 |
| |
366 | 366 |
| |
| |||
1201 | 1201 |
| |
1202 | 1202 |
| |
1203 | 1203 |
| |
1204 |
| - | |
| 1204 | + | |
1205 | 1205 |
| |
1206 | 1206 |
| |
1207 | 1207 |
| |
| |||
1975 | 1975 |
| |
1976 | 1976 |
| |
1977 | 1977 |
| |
1978 |
| - | |
| 1978 | + | |
1979 | 1979 |
| |
1980 | 1980 |
| |
1981 | 1981 |
| |
|
Lines changed: 7 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
14 | 14 |
| |
15 | 15 |
| |
16 | 16 |
| |
17 |
| - | |
| 17 | + | |
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
| |||
103 | 103 |
| |
104 | 104 |
| |
105 | 105 |
| |
106 |
| - | |
| 106 | + | |
107 | 107 |
| |
108 |
| - | |
| 108 | + | |
109 | 109 |
| |
110 | 110 |
| |
111 | 111 |
| |
| |||
116 | 116 |
| |
117 | 117 |
| |
118 | 118 |
| |
119 |
| - | |
| 119 | + | |
120 | 120 |
| |
121 | 121 |
| |
122 | 122 |
| |
| |||
126 | 126 |
| |
127 | 127 |
| |
128 | 128 |
| |
129 |
| - | |
| 129 | + | |
130 | 130 |
| |
131 | 131 |
| |
132 | 132 |
| |
133 | 133 |
| |
134 | 134 |
| |
135 | 135 |
| |
136 | 136 |
| |
137 |
| - | |
| 137 | + | |
138 | 138 |
| |
139 | 139 |
| |
140 | 140 |
| |
| |||
671 | 671 |
| |
672 | 672 |
| |
673 | 673 |
| |
674 |
| - | |
| 674 | + | |
675 | 675 |
| |
676 | 676 |
| |
677 | 677 |
| |
|
Lines changed: 6 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
461 | 461 |
| |
462 | 462 |
| |
463 | 463 |
| |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
464 | 469 |
| |
465 | 470 |
| |
466 | 471 |
| |
467 |
| - | |
| 472 | + | |
468 | 473 |
| |
469 | 474 |
| |
470 | 475 |
| |
|
Lines changed: 7 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
780 | 780 |
| |
781 | 781 |
| |
782 | 782 |
| |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
783 | 788 |
| |
784 | 789 |
| |
785 | 790 |
| |
786 |
| - | |
| 791 | + | |
787 | 792 |
| |
788 | 793 |
| |
789 | 794 |
| |
790 | 795 |
| |
791 | 796 |
| |
792 |
| - | |
| 797 | + | |
793 | 798 |
| |
794 | 799 |
| |
795 | 800 |
| |
|
Lines changed: 5 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
34 | 34 |
| |
35 | 35 |
| |
36 | 36 |
| |
37 |
| - | |
| 37 | + | |
38 | 38 |
| |
39 |
| - | |
| 39 | + | |
40 | 40 |
| |
41 | 41 |
| |
42 | 42 |
| |
| |||
65 | 65 |
| |
66 | 66 |
| |
67 | 67 |
| |
68 |
| - | |
69 |
| - | |
| 68 | + | |
| 69 | + | |
70 | 70 |
| |
71 | 71 |
| |
72 | 72 |
| |
73 | 73 |
| |
74 | 74 |
| |
75 |
| - | |
| 75 | + | |
76 | 76 |
| |
77 | 77 |
| |
78 | 78 |
| |
|
Lines changed: 15 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
| 16 | + | |
| 17 | + | |
17 | 18 |
| |
| 19 | + | |
| 20 | + | |
| 21 | + | |
18 | 22 |
| |
19 | 23 |
| |
20 | 24 |
| |
| |||
79 | 83 |
| |
80 | 84 |
| |
81 | 85 |
| |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
82 | 95 |
| |
83 | 96 |
| |
84 |
| - | |
| 97 | + | |
85 | 98 |
| |
86 | 99 |
| |
87 | 100 |
| |
|
Lines changed: 15 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
12 | 14 |
| |
13 | 15 |
| |
14 | 16 |
| |
| |||
122 | 124 |
| |
123 | 125 |
| |
124 | 126 |
| |
125 |
| - | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
126 | 139 |
| |
127 | 140 |
| |
128 | 141 |
| |
|
0 commit comments