Kouhei Sutou
null+****@clear*****
Mon Mar 16 12:19:03 JST 2015
Kouhei Sutou 2015-03-16 12:19:03 +0900 (Mon, 16 Mar 2015) New Revision: 286ee4bf6ff09a8f67b55184f86779127a6c3db7 https://github.com/groonga/groonga/commit/286ee4bf6ff09a8f67b55184f86779127a6c3db7 Message: doc tokenizers: add lexicon Modified files: doc/source/images/reference/tokenizers/used-when-indexing.png doc/source/images/reference/tokenizers/used-when-indexing.svg doc/source/images/reference/tokenizers/used-when-searching.png doc/source/images/reference/tokenizers/used-when-searching.svg Modified: doc/source/images/reference/tokenizers/used-when-indexing.png (+0 -0) =================================================================== (Binary files differ) Modified: doc/source/images/reference/tokenizers/used-when-indexing.svg (+106 -23) =================================================================== --- doc/source/images/reference/tokenizers/used-when-indexing.svg 2015-03-14 22:54:33 +0900 (78ed502) +++ doc/source/images/reference/tokenizers/used-when-indexing.svg 2015-03-16 12:19:03 +0900 (b7b0f63) @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="823.34076" - height="561.80884" + width="814.34076" + height="546.41425" id="svg2" version="1.1" inkscape:version="0.48.5 r10040" @@ -42,9 +42,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.35" - inkscape:cx="860.7163" - inkscape:cy="202.49623" + inkscape:zoom="0.7" + inkscape:cx="751.02271" + inkscape:cy="245.37064" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -65,7 +65,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -119,18 +119,18 @@ <text xml:space="preserve" style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="518.14075" - y="650.28534" + x="566.72961" + y="408.19534" id="text2999" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3001" - x="518.14075" - y="650.28534">index column</tspan></text> + x="566.72961" + y="408.19534">lexicon</tspan></text> <rect ry="5" rx="5" - y="430.93359" + y="470.93359" x="568.14069" height="162.85715" width="145.71428" @@ -200,34 +200,34 @@ <text sodipodi:linespacing="125%" id="text4828" - y="456.88483" - x="582.85803" + y="496.88483" + x="578.85803" style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" xml:space="preserve"><tspan - y="456.88483" - x="582.85803" + y="496.88483" + x="578.85803" id="tspan4830" sodipodi:role="line">Hello</tspan></text> <text xml:space="preserve" style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="582.85803" - y="496.88483" + x="578.85803" + y="536.88483" id="text4832" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan4834" - x="582.85803" - y="496.88483">World</tspan></text> + x="578.85803" + y="536.88483">World</tspan></text> <text sodipodi:linespacing="125%" id="text4836" - y="536.88483" - x="582.85803" + y="576.88483" + x="578.85803" style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" xml:space="preserve"><tspan - y="536.88483" - x="582.85803" + y="576.88483" + x="578.85803" id="tspan4838" sodipodi:role="line">!</tspan></text> <path @@ -247,5 +247,88 @@ x="-32.857159" id="tspan3014" sodipodi:role="line">(text)</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3014" + y="437.19077" + x="676.71613" + style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + xml:space="preserve"><tspan + y="437.19077" + x="676.71613" + id="tspan3016" + sodipodi:role="line">index</tspan><tspan + y="462.19077" + x="676.71613" + sodipodi:role="line" + id="tspan3017">column</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans" + x="603.4801" + y="458.92935" + id="text3019" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3025" + x="608.4801" + y="458.92935">_key </tspan></text> + <path + style="fill:none;stroke:#204a87;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 699.28571,373.23741 0,160.71429" + id="path3027" + inkscape:connector-curvature="0" + transform="translate(-57.6,98.876477)" /> + <path + inkscape:connector-curvature="0" + id="path3803" + d="m 713.47143,508.8996 -145.35715,0" + style="fill:none;stroke:#204a87;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + style="fill:none;stroke:#204a87;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 713.47143,548.8996 -145.35715,0" + id="path3805" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3807" + d="m 713.47143,588.8996 -145.35715,0" + style="fill:none;stroke:#204a87;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="cc" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="651.57233" + y="496.88483" + id="text3809" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3811" + x="651.57233" + y="496.88483">1,3,5</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3813" + y="536.88483" + x="651.57233" + style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + xml:space="preserve"><tspan + y="536.88483" + x="651.57233" + id="tspan3815" + sodipodi:role="line">2,3</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="651.57233" + y="576.88483" + id="text3817" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3819" + x="651.57233" + y="576.88483">3</tspan></text> </g> </svg> Modified: doc/source/images/reference/tokenizers/used-when-searching.png (+0 -0) =================================================================== (Binary files differ) Modified: doc/source/images/reference/tokenizers/used-when-searching.svg (+121 -22) =================================================================== --- doc/source/images/reference/tokenizers/used-when-searching.svg 2015-03-14 22:54:33 +0900 (1785d61) +++ doc/source/images/reference/tokenizers/used-when-searching.svg 2015-03-16 12:19:03 +0900 (7a31929) @@ -9,8 +9,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="865.50397" - height="313.52319" + width="829.40387" + height="345.52319" id="svg2" version="1.1" inkscape:version="0.48.5 r10040" @@ -42,9 +42,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="0.7" - inkscape:cx="501.07427" - inkscape:cy="247.98597" + inkscape:zoom="0.9899495" + inkscape:cx="682.91937" + inkscape:cy="132.74659" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -65,7 +65,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -73,7 +73,7 @@ inkscape:label="レイヤー 1" inkscape:groupmode="layer" id="layer1" - transform="translate(54.028572,-224.70504)"> + transform="translate(54.028572,-192.70504)"> <text xml:space="preserve" style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" @@ -98,15 +98,19 @@ y="368.07648">search</tspan></text> <text xml:space="preserve" - style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="563.87537" - y="326.02426" + style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="728.18964" + y="313.88141" id="text2999" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3001" - x="563.87537" - y="326.02426">index column</tspan></text> + x="728.18964" + y="313.88141">index</tspan><tspan + sodipodi:role="line" + x="728.18964" + y="338.88141" + id="tspan3015">column</tspan></text> <rect ry="5" rx="5" @@ -136,44 +140,44 @@ xml:space="preserve" style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" x="267.14282" - y="265.50504" + y="233.50504" id="text3058" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan3060" x="267.14282" - y="265.50504">(tokenizer is used)</tspan></text> + y="233.50504">(tokenizer is used)</tspan></text> <text sodipodi:linespacing="125%" id="text4828" y="374.05231" - x="632.87836" + x="628.87836" style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" xml:space="preserve"><tspan y="374.05231" - x="632.87836" + x="628.87836" id="tspan4830" sodipodi:role="line">Hello</tspan></text> <text xml:space="preserve" style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="632.87836" + x="628.87836" y="414.05231" id="text4832" sodipodi:linespacing="125%"><tspan sodipodi:role="line" id="tspan4834" - x="632.87836" + x="628.87836" y="414.05231">World</tspan></text> <text sodipodi:linespacing="125%" id="text4836" y="454.05231" - x="632.87836" + x="628.87836" style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" xml:space="preserve"><tspan y="454.05231" - x="632.87836" + x="628.87836" id="tspan4838" sodipodi:role="line">!</tspan></text> <text @@ -220,9 +224,104 @@ id="tspan3082">set</tspan></text> <path style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0;marker-end:url(#Arrow1Lend)" - d="m 505.71429,181.80884 0,54.28571" + d="m 505.71429,145.38027 0,90.71428" id="path3010" inkscape:connector-curvature="0" - transform="translate(-57.6,98.876477)" /> + transform="translate(-57.6,98.876477)" + sodipodi:nodetypes="cc" /> + <text + sodipodi:linespacing="125%" + id="text3011" + y="287.23746" + x="619.84967" + style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + xml:space="preserve"><tspan + y="287.23746" + x="619.84967" + id="tspan3013" + sodipodi:role="line">lexicon</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3017" + y="313.88141" + x="728.18964" + style="font-size:20px;font-style:normal;font-weight:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + xml:space="preserve"><tspan + y="313.88141" + x="728.18964" + id="tspan3019" + sodipodi:role="line">index</tspan><tspan + id="tspan3021" + y="338.88141" + x="728.18964" + sodipodi:role="line">column</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans" + x="652.40155" + y="334.58954" + id="text3018" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3024" + x="652.40155" + y="334.58954">_key</tspan></text> + <path + style="fill:none;stroke:#204a87;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 748.01796,123.10944 0,163.13963" + id="path3026" + inkscape:connector-curvature="0" + transform="translate(-54.028572,224.70504)" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="702.87836" + y="374.05231" + id="text3802" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3804" + x="702.87836" + y="374.05231">1,3,5</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3806" + y="414.05231" + x="702.87836" + style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + xml:space="preserve"><tspan + y="414.05231" + x="702.87836" + id="tspan3808" + sodipodi:role="line">2,3</tspan></text> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" + x="702.87836" + y="454.05231" + id="text3810" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3812" + x="702.87836" + y="454.05231">3</tspan></text> + <path + inkscape:connector-curvature="0" + id="path3814" + d="m 762.9323,385.44266 -143.94674,0" + style="fill:none;stroke:#204a87;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + style="fill:none;stroke:#204a87;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 762.9323,427.44266 -143.94674,0" + id="path3816" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3818" + d="m 762.9323,467.44266 -143.94674,0" + style="fill:none;stroke:#204a87;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + sodipodi:nodetypes="cc" /> </g> </svg> -------------- next part -------------- HTML����������������������������...Download