File tree
8 files changed
+254
-163
lines changed- plugins/mapper-annotated-text/src
- main/java/org/elasticsearch
- index/mapper/annotatedtext
- search/fetch/subphase/highlight
- test/java/org/elasticsearch/search/fetch/subphase/highlight
- server/src
- main/java/org
- apache/lucene/search/uhighlight
- elasticsearch/search/fetch/subphase/highlight
- test/java/org/apache/lucene/search/uhighlight
8 files changed
+254
-163
lines changedLines changed: 7 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
46 | 46 |
| |
47 | 47 |
| |
48 | 48 |
| |
49 |
| - | |
50 | 49 |
| |
51 | 50 |
| |
52 | 51 |
| |
| |||
299 | 298 |
| |
300 | 299 |
| |
301 | 300 |
| |
302 |
| - | |
303 |
| - | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
304 | 304 |
| |
305 | 305 |
| |
306 |
| - | |
307 | 306 |
| |
308 | 307 |
| |
309 | 308 |
| |
310 | 309 |
| |
311 | 310 |
| |
312 | 311 |
| |
313 | 312 |
| |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
314 | 317 |
| |
315 | 318 |
| |
316 | 319 |
| |
317 |
| - | |
318 | 320 |
| |
319 | 321 |
| |
320 | 322 |
| |
|
Lines changed: 4 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
44 | 44 |
| |
45 | 45 |
| |
46 | 46 |
| |
47 |
| - | |
| 47 | + | |
48 | 48 |
| |
| 49 | + | |
| 50 | + | |
| 51 | + | |
49 | 52 |
| |
50 | 53 |
| |
51 | 54 |
| |
|
Lines changed: 23 additions & 24 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
21 | 21 |
| |
22 | 22 |
| |
23 | 23 |
| |
| 24 | + | |
24 | 25 |
| |
25 | 26 |
| |
26 | 27 |
| |
| |||
37 | 38 |
| |
38 | 39 |
| |
39 | 40 |
| |
40 |
| - | |
41 |
| - | |
42 |
| - | |
43 |
| - | |
44 |
| - | |
45 | 41 |
| |
46 | 42 |
| |
47 |
| - | |
48 |
| - | |
49 |
| - | |
50 |
| - | |
51 |
| - | |
52 |
| - | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
53 | 51 |
| |
54 |
| - | |
55 |
| - | |
56 |
| - | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
57 | 57 |
| |
58 |
| - | |
59 |
| - | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
60 | 63 |
| |
61 |
| - | |
62 |
| - | |
63 |
| - | |
64 |
| - | |
65 |
| - | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
66 | 67 |
| |
67 | 68 |
| |
68 | 69 |
| |
69 | 70 |
| |
70 |
| - | |
71 |
| - | |
72 |
| - | |
| 71 | + | |
73 | 72 |
| |
74 | 73 |
| |
75 | 74 |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
20 |
| - | |
| 20 | + | |
21 | 21 |
| |
22 | 22 |
| |
23 | 23 |
| |
| |||
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
32 | 31 |
| |
33 | 32 |
| |
34 | 33 |
| |
| |||
48 | 47 |
| |
49 | 48 |
| |
50 | 49 |
| |
51 |
| - | |
52 |
| - | |
53 | 50 |
| |
54 | 51 |
| |
55 | 52 |
| |
56 | 53 |
| |
57 | 54 |
| |
58 |
| - | |
59 | 55 |
| |
60 | 56 |
| |
61 | 57 |
| |
| |||
70 | 66 |
| |
71 | 67 |
| |
72 | 68 |
| |
73 |
| - | |
74 | 69 |
| |
75 | 70 |
| |
76 | 71 |
| |
| |||
93 | 88 |
| |
94 | 89 |
| |
95 | 90 |
| |
96 |
| - | |
97 |
| - | |
98 |
| - | |
99 |
| - | |
100 | 91 |
| |
101 | 92 |
| |
102 | 93 |
| |
103 | 94 |
| |
104 |
| - | |
105 |
| - | |
106 |
| - | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
107 | 99 |
| |
108 | 100 |
| |
109 | 101 |
| |
| |||
113 | 105 |
| |
114 | 106 |
| |
115 | 107 |
| |
116 |
| - | |
117 |
| - | |
118 |
| - | |
119 |
| - | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
120 | 124 |
| |
121 |
| - | |
122 |
| - | |
| 125 | + | |
123 | 126 |
| |
124 | 127 |
| |
125 | 128 |
| |
|
Lines changed: 14 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
19 | 19 |
| |
20 | 20 |
| |
21 | 21 |
| |
| 22 | + | |
22 | 23 |
| |
23 | 24 |
| |
24 | 25 |
| |
| |||
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 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
53 | 64 |
| |
54 | 65 |
| |
55 | 66 |
| |
|
0 commit comments