droonga-engine 1.0.2 → 1.0.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (203) hide show
  1. checksums.yaml +7 -0
  2. data/.gitignore +1 -0
  3. data/.travis.yml +3 -0
  4. data/Gemfile +7 -0
  5. data/Rakefile +6 -2
  6. data/bin/droonga-engine +2 -2
  7. data/bin/{droonga-catalog-generate → droonga-engine-catalog-generate} +15 -3
  8. data/bin/droonga-engine-serf-event-handler +20 -0
  9. data/bin/droonga-engine-service +2 -2
  10. data/doc/text/news.md +21 -1
  11. data/droonga-engine.gemspec +5 -2
  12. data/lib/droonga/catalog/collection_volume.rb +12 -0
  13. data/lib/droonga/catalog/dataset.rb +25 -0
  14. data/lib/droonga/catalog/single_volume.rb +10 -0
  15. data/lib/droonga/catalog/slice.rb +4 -0
  16. data/lib/droonga/catalog/version1.rb +59 -48
  17. data/lib/droonga/catalog/version2.rb +10 -20
  18. data/lib/droonga/catalog/volume_collection.rb +27 -4
  19. data/lib/droonga/catalog_generator.rb +12 -5
  20. data/lib/droonga/catalog_observer.rb +17 -35
  21. data/lib/droonga/command/droonga_engine.rb +436 -0
  22. data/lib/droonga/command/droonga_engine_service.rb +273 -0
  23. data/lib/droonga/command/serf_event_handler.rb +85 -0
  24. data/lib/droonga/dispatcher.rb +8 -8
  25. data/lib/droonga/engine.rb +90 -26
  26. data/lib/droonga/engine/version.rb +1 -1
  27. data/lib/droonga/engine_state.rb +29 -3
  28. data/lib/droonga/internal_fluent_message_receiver.rb +100 -0
  29. data/lib/droonga/live_nodes_list_loader.rb +48 -0
  30. data/lib/droonga/live_nodes_list_observer.rb +72 -0
  31. data/lib/droonga/path.rb +47 -0
  32. data/lib/droonga/plugins/dump.rb +279 -38
  33. data/lib/droonga/plugins/groonga/select.rb +26 -14
  34. data/lib/droonga/plugins/search.rb +30 -2
  35. data/lib/droonga/plugins/search/distributed_search_planner.rb +28 -11
  36. data/lib/droonga/processor.rb +4 -0
  37. data/lib/droonga/searcher.rb +26 -0
  38. data/lib/droonga/serf.rb +119 -0
  39. data/lib/droonga/serf_downloader.rb +90 -0
  40. data/lib/droonga/server.rb +2 -2
  41. data/lib/droonga/service_control_protocol.rb +26 -0
  42. data/sample/cluster/catalog.json +1 -1
  43. data/test/command/config/default/catalog.json +2 -2
  44. data/test/command/config/version1/catalog.json +1 -1
  45. data/test/command/fixture/documents.jsons +18 -18
  46. data/test/command/fixture/event.jsons +4 -4
  47. data/test/command/fixture/user-table-array.jsons +4 -4
  48. data/test/command/fixture/user-table.jsons +5 -5
  49. data/test/command/suite/add/dimension/column.catalog.json +1 -1
  50. data/test/command/suite/add/dimension/column.test +4 -4
  51. data/test/command/suite/add/dimension/integer.catalog.json +1 -1
  52. data/test/command/suite/add/dimension/integer.test +4 -4
  53. data/test/command/suite/add/error/invalid-integer.test +1 -1
  54. data/test/command/suite/add/error/invalid-time.test +1 -1
  55. data/test/command/suite/add/error/missing-key.test +1 -1
  56. data/test/command/suite/add/error/missing-table.test +1 -1
  57. data/test/command/suite/add/error/unknown-column.test +1 -1
  58. data/test/command/suite/add/error/unknown-table.test +1 -1
  59. data/test/command/suite/add/minimum.test +1 -1
  60. data/test/command/suite/add/vector/short_text.catalog.json +26 -0
  61. data/test/command/suite/add/vector/short_text.expected +42 -0
  62. data/test/command/suite/add/vector/short_text.test +35 -0
  63. data/test/command/suite/add/with-values.test +1 -1
  64. data/test/command/suite/add/without-key.test +1 -1
  65. data/test/command/suite/dump/column/index.catalog.json +40 -0
  66. data/test/command/suite/dump/column/index.expected +195 -0
  67. data/test/command/suite/dump/column/index.test +5 -0
  68. data/test/command/suite/dump/column/scalar.catalog.json +19 -0
  69. data/test/command/suite/dump/column/scalar.expected +99 -0
  70. data/test/command/suite/dump/column/scalar.test +5 -0
  71. data/test/command/suite/dump/column/vector.catalog.json +22 -0
  72. data/test/command/suite/dump/column/vector.expected +108 -0
  73. data/test/command/suite/dump/column/vector.test +5 -0
  74. data/test/command/suite/dump/record/vector/reference.catalog.json +27 -0
  75. data/test/command/suite/dump/record/vector/reference.expected +213 -0
  76. data/test/command/suite/dump/record/vector/reference.test +21 -0
  77. data/test/command/suite/dump/table/array.catalog.json +13 -0
  78. data/test/command/suite/dump/table/array.expected +63 -0
  79. data/test/command/suite/dump/table/array.test +5 -0
  80. data/test/command/suite/dump/table/double_array_trie.catalog.json +14 -0
  81. data/test/command/suite/dump/table/double_array_trie.expected +66 -0
  82. data/test/command/suite/dump/table/double_array_trie.test +5 -0
  83. data/test/command/suite/dump/table/hash.catalog.json +14 -0
  84. data/test/command/suite/dump/table/hash.expected +66 -0
  85. data/test/command/suite/dump/table/hash.test +5 -0
  86. data/test/command/suite/dump/table/patricia_trie.catalog.json +14 -0
  87. data/test/command/suite/dump/table/patricia_trie.expected +66 -0
  88. data/test/command/suite/dump/table/patricia_trie.test +5 -0
  89. data/test/command/suite/groonga/column_create/scalar.test +2 -2
  90. data/test/command/suite/groonga/column_create/unknown-table.test +1 -1
  91. data/test/command/suite/groonga/column_create/vector.test +2 -2
  92. data/test/command/suite/groonga/column_list/success.test +3 -3
  93. data/test/command/suite/groonga/column_list/unknown-table.test +1 -1
  94. data/test/command/suite/groonga/column_remove/success.test +3 -3
  95. data/test/command/suite/groonga/column_remove/unknown-column.test +2 -2
  96. data/test/command/suite/groonga/column_remove/unknown-table.test +1 -1
  97. data/test/command/suite/groonga/column_rename/success.test +3 -3
  98. data/test/command/suite/groonga/column_rename/unknown-column.test +2 -2
  99. data/test/command/suite/groonga/column_rename/unknown-table.test +1 -1
  100. data/test/command/suite/groonga/delete/duplicated-identifiers.test +2 -2
  101. data/test/command/suite/groonga/delete/filter.test +2 -2
  102. data/test/command/suite/groonga/delete/invalid-filter.test +1 -1
  103. data/test/command/suite/groonga/delete/no-identifier.test +2 -2
  104. data/test/command/suite/groonga/delete/success.test +2 -2
  105. data/test/command/suite/groonga/delete/unknown-table.test +1 -1
  106. data/test/command/suite/groonga/select/minimum.expected +24 -1
  107. data/test/command/suite/groonga/select/minimum.test +1 -1
  108. data/test/command/suite/groonga/select/type/time.catalog.json +19 -0
  109. data/test/command/suite/groonga/select/type/time.expected +37 -0
  110. data/test/command/suite/groonga/select/type/time.test +35 -0
  111. data/test/command/suite/groonga/table_create/array.test +1 -1
  112. data/test/command/suite/groonga/table_create/hash.test +1 -1
  113. data/test/command/suite/groonga/table_list/success.test +2 -2
  114. data/test/command/suite/groonga/table_remove/success.test +1 -1
  115. data/test/command/suite/groonga/table_remove/unknown-table.test +1 -1
  116. data/test/command/suite/message/error/unknown-type.expected +1 -1
  117. data/test/command/suite/message/error/unknown-type.test +1 -1
  118. data/test/command/suite/search/adjusters/multiple.catalog.json +1 -1
  119. data/test/command/suite/search/adjusters/multiple.test +3 -3
  120. data/test/command/suite/search/adjusters/one.catalog.json +1 -1
  121. data/test/command/suite/search/adjusters/one.test +3 -3
  122. data/test/command/suite/search/attributes/array.expected +7 -0
  123. data/test/command/suite/search/attributes/array.test +1 -1
  124. data/test/command/suite/search/attributes/hash.expected +18 -0
  125. data/test/command/suite/search/attributes/hash.test +1 -1
  126. data/test/command/suite/search/complex.expected +12 -0
  127. data/test/command/suite/search/complex.test +1 -1
  128. data/test/command/suite/search/condition/nested.catalog.json +37 -0
  129. data/test/command/suite/search/condition/nested.expected +7 -0
  130. data/test/command/suite/search/condition/nested.test +103 -2
  131. data/test/command/suite/search/condition/query.catalog.json +37 -0
  132. data/test/command/suite/search/condition/query.expected +7 -0
  133. data/test/command/suite/search/condition/query.test +103 -2
  134. data/test/command/suite/search/condition/query/nonexistent_column.catalog.json +1 -1
  135. data/test/command/suite/search/condition/query/nonexistent_column.test +2 -2
  136. data/test/command/suite/search/condition/query/syntax_error.catalog.json +1 -1
  137. data/test/command/suite/search/condition/query/syntax_error.test +2 -2
  138. data/test/command/suite/search/condition/script.catalog.json +37 -0
  139. data/test/command/suite/search/condition/script.expected +7 -0
  140. data/test/command/suite/search/condition/script.test +103 -2
  141. data/test/command/suite/search/error/cyclic-source.test +1 -1
  142. data/test/command/suite/search/error/deeply-cyclic-source.test +1 -1
  143. data/test/command/suite/search/error/missing-source-parameter.test +1 -1
  144. data/test/command/suite/search/error/no-query.test +1 -1
  145. data/test/command/suite/search/error/unknown-source.test +1 -1
  146. data/test/command/suite/search/group/count.test +1 -1
  147. data/test/command/suite/search/group/limit.test +1 -1
  148. data/test/command/suite/search/group/string.catalog.json +41 -0
  149. data/test/command/suite/search/group/string.expected +18 -18
  150. data/test/command/suite/search/group/string.test +67 -22
  151. data/test/command/suite/search/group/subrecord/with-sort.catalog.json +1 -1
  152. data/test/command/suite/search/group/subrecord/with-sort.test +5 -5
  153. data/test/command/suite/search/multiple/chained.catalog.json +37 -0
  154. data/test/command/suite/search/multiple/chained.expected +14 -0
  155. data/test/command/suite/search/multiple/chained.test +103 -2
  156. data/test/command/suite/search/multiple/parallel.expected +14 -0
  157. data/test/command/suite/search/multiple/parallel.test +1 -1
  158. data/test/command/suite/search/output/attributes/invalid.catalog.json +1 -1
  159. data/test/command/suite/search/output/attributes/invalid.test +2 -2
  160. data/test/command/suite/search/output/attributes/star.catalog.json +23 -0
  161. data/test/command/suite/search/output/attributes/star.expected +27 -0
  162. data/test/command/suite/search/output/attributes/star.test +32 -0
  163. data/test/command/suite/search/range/only-output.expected +7 -0
  164. data/test/command/suite/search/range/only-output.test +1 -1
  165. data/test/command/suite/search/range/only-sort.expected +7 -0
  166. data/test/command/suite/search/range/only-sort.test +1 -1
  167. data/test/command/suite/search/range/sort-and-output.expected +7 -0
  168. data/test/command/suite/search/range/sort-and-output.test +1 -1
  169. data/test/command/suite/search/range/too-large-output-offset.expected +8 -0
  170. data/test/command/suite/search/range/too-large-output-offset.test +1 -1
  171. data/test/command/suite/search/range/too-large-sort-offset.expected +8 -0
  172. data/test/command/suite/search/range/too-large-sort-offset.test +1 -1
  173. data/test/command/suite/search/response/elapsed_time.catalog.json +1 -1
  174. data/test/command/suite/search/response/elapsed_time.test +2 -2
  175. data/test/command/suite/search/response/records/value/time.expected +12 -0
  176. data/test/command/suite/search/response/records/value/time.test +1 -1
  177. data/test/command/suite/search/simple.expected +12 -0
  178. data/test/command/suite/search/simple.test +1 -1
  179. data/test/command/suite/search/sort/default-offset-limit.expected +7 -0
  180. data/test/command/suite/search/sort/default-offset-limit.test +1 -1
  181. data/test/command/suite/search/sort/invisible-column.expected +7 -0
  182. data/test/command/suite/search/sort/invisible-column.test +1 -1
  183. data/test/unit/catalog/test_collection_volume.rb +16 -0
  184. data/test/unit/catalog/test_dataset.rb +36 -0
  185. data/test/unit/catalog/test_single_volume.rb +9 -0
  186. data/test/unit/catalog/test_slice.rb +11 -0
  187. data/test/unit/catalog/test_version1.rb +7 -12
  188. data/test/unit/catalog/test_version2.rb +7 -0
  189. data/test/unit/catalog/test_volume_collection.rb +28 -0
  190. data/test/unit/fixtures/catalog/version1.json +10 -3
  191. data/test/unit/fixtures/catalog/version2.json +2 -2
  192. data/test/unit/plugins/groonga/select/test_adapter_output.rb +8 -14
  193. data/test/unit/plugins/groonga/test_column_create.rb +5 -5
  194. data/test/unit/plugins/groonga/test_column_remove.rb +2 -2
  195. data/test/unit/plugins/groonga/test_column_rename.rb +2 -2
  196. data/test/unit/plugins/groonga/test_delete.rb +2 -2
  197. data/test/unit/plugins/groonga/test_table_create.rb +9 -9
  198. data/test/unit/plugins/groonga/test_table_remove.rb +1 -1
  199. data/test/unit/test_catalog_generator.rb +1 -1
  200. data/test/unit/test_schema_applier.rb +2 -2
  201. data/test/unit/test_watch_schema.rb +4 -4
  202. metadata +241 -72
  203. data/lib/droonga/engine/command/droonga_engine.rb +0 -441
data/test/command/suite/search/condition/script.expected CHANGED
@@ -5,6 +5,13 @@
5
5
  "body": {
6
6
  "result": {
7
7
  "count": 4,
8
+ "attributes": [
9
+ {
10
+ "name": "title",
11
+ "type": "ShortText",
12
+ "vector": false
13
+ }
14
+ ],
8
15
  "records": [
9
16
  [
10
17
  "Groonga overview"
data/test/command/suite/search/condition/script.test CHANGED
@@ -1,7 +1,108 @@
1
- #@include fixture/documents.jsons
1
+ #@require-catalog-version 2
2
+ #@disable-logging
3
+ {
4
+ "dataset": "Default",
5
+ "type": "add",
6
+ "body": {
7
+ "table": "Sections",
8
+ "key": "1.1",
9
+ "values": {
10
+ "title": "Groonga overview"
11
+ }
12
+ }
13
+ }
14
+ {
15
+ "dataset": "Default",
16
+ "type": "add",
17
+ "body": {
18
+ "table": "Sections",
19
+ "key": "1.2",
20
+ "values": {
21
+ "title": "Full text search and Instant update"
22
+ }
23
+ }
24
+ }
25
+ {
26
+ "dataset": "Default",
27
+ "type": "add",
28
+ "body": {
29
+ "table": "Sections",
30
+ "key": "1.3",
31
+ "values": {
32
+ "title": "Column store and aggregate query"
33
+ }
34
+ }
35
+ }
36
+ {
37
+ "dataset": "Default",
38
+ "type": "add",
39
+ "body": {
40
+ "table": "Sections",
41
+ "key": "1.4",
42
+ "values": {
43
+ "title": "Inverted index and tokenizer"
44
+ }
45
+ }
46
+ }
47
+ {
48
+ "dataset": "Default",
49
+ "type": "add",
50
+ "body": {
51
+ "table": "Sections",
52
+ "key": "1.5",
53
+ "values": {
54
+ "title": "Sharable storage and read lock-free"
55
+ }
56
+ }
57
+ }
58
+ {
59
+ "dataset": "Default",
60
+ "type": "add",
61
+ "body": {
62
+ "table": "Sections",
63
+ "key": "1.6",
64
+ "values": {
65
+ "title": "Geo-location (latitude and longitude) search"
66
+ }
67
+ }
68
+ }
69
+ {
70
+ "dataset": "Default",
71
+ "type": "add",
72
+ "body": {
73
+ "table": "Sections",
74
+ "key": "1.7",
75
+ "values": {
76
+ "title": "Groonga library"
77
+ }
78
+ }
79
+ }
80
+ {
81
+ "dataset": "Default",
82
+ "type": "add",
83
+ "body": {
84
+ "table": "Sections",
85
+ "key": "1.8",
86
+ "values": {
87
+ "title": "Groonga server"
88
+ }
89
+ }
90
+ }
91
+ {
92
+ "dataset": "Default",
93
+ "type": "add",
94
+ "body": {
95
+ "table": "Sections",
96
+ "key": "1.9",
97
+ "values": {
98
+ "title": "Groonga storage engine"
99
+ }
100
+ }
101
+ }
102
+ #@enable-logging
2
103
  {
3
104
  "type": "search",
4
- "dataset": "Droonga",
105
+ "dataset": "Default",
5
106
  "body": {
6
107
  "queries": {
7
108
  "result": {
data/test/command/suite/search/error/cyclic-source.test CHANGED
@@ -1,7 +1,7 @@
1
1
  #@include fixture/user-table.jsons
2
2
  {
3
3
  "type": "search",
4
- "dataset": "Droonga",
4
+ "dataset": "Default",
5
5
  "body": {
6
6
  "queries": {
7
7
  "cyclic-source": {
data/test/command/suite/search/error/deeply-cyclic-source.test CHANGED
@@ -1,7 +1,7 @@
1
1
  #@include fixture/user-table.jsons
2
2
  {
3
3
  "type": "search",
4
- "dataset": "Droonga",
4
+ "dataset": "Default",
5
5
  "body": {
6
6
  "queries": {
7
7
  "a": {
data/test/command/suite/search/error/missing-source-parameter.test CHANGED
@@ -1,7 +1,7 @@
1
1
  #@include fixture/user-table.jsons
2
2
  {
3
3
  "type": "search",
4
- "dataset": "Droonga",
4
+ "dataset": "Default",
5
5
  "body": {
6
6
  "queries": {
7
7
  "no-source": {
data/test/command/suite/search/error/no-query.test CHANGED
@@ -1,7 +1,7 @@
1
1
  #@include fixture/user-table.jsons
2
2
  {
3
3
  "type": "search",
4
- "dataset": "Droonga",
4
+ "dataset": "Default",
5
5
  "body": {
6
6
  }
7
7
  }
data/test/command/suite/search/error/unknown-source.test CHANGED
@@ -1,7 +1,7 @@
1
1
  #@include fixture/user-table.jsons
2
2
  {
3
3
  "type": "search",
4
- "dataset": "Droonga",
4
+ "dataset": "Default",
5
5
  "body": {
6
6
  "queries": {
7
7
  "unknown-source": {
data/test/command/suite/search/group/count.test CHANGED
@@ -1,7 +1,7 @@
1
1
  #@include fixture/documents.jsons
2
2
  {
3
3
  "type": "search",
4
- "dataset": "Droonga",
4
+ "dataset": "Default",
5
5
  "body": {
6
6
  "queries": {
7
7
  "documents": {
data/test/command/suite/search/group/limit.test CHANGED
@@ -1,7 +1,7 @@
1
1
  #@include fixture/documents.jsons
2
2
  {
3
3
  "type": "search",
4
- "dataset": "Droonga",
4
+ "dataset": "Default",
5
5
  "body": {
6
6
  "queries": {
7
7
  "documents": {
data/test/command/suite/search/group/string.catalog.json ADDED
@@ -0,0 +1,41 @@
1
+ {
2
+ "datasets": {
3
+ "Default": {
4
+ "schema": {
5
+ "Sections": {
6
+ "type": "Hash",
7
+ "keyType": "ShortText",
8
+ "columns": {
9
+ "document": {
10
+ "type": "Scalar",
11
+ "valueType": "ShortText"
12
+ },
13
+ "title": {
14
+ "type": "Scalar",
15
+ "valueType": "ShortText"
16
+ }
17
+ }
18
+ },
19
+ "Terms": {
20
+ "type": "PatriciaTrie",
21
+ "keyType": "ShortText",
22
+ "normalizer": "NormalizerAuto",
23
+ "tokenizer": "TokenBigram",
24
+ "columns": {
25
+ "title_index": {
26
+ "type": "Index",
27
+ "valueType": "Sections",
28
+ "indexOptions": {
29
+ "sources": [
30
+ "title"
31
+ ],
32
+ "position": true
33
+ }
34
+ }
35
+ }
36
+ }
37
+ },
38
+ "fact": "Sections"
39
+ }
40
+ }
41
+ }
data/test/command/suite/search/group/string.expected CHANGED
@@ -3,28 +3,28 @@
3
3
  "statusCode": 200,
4
4
  "type": "search.result",
5
5
  "body": {
6
- "Groonga": {
7
- "count": 4,
6
+ "documents": {
7
+ "count": 2,
8
+ "attributes": [
9
+ {
10
+ "name": "_key",
11
+ "type": "ShortText",
12
+ "vector": false
13
+ },
14
+ {
15
+ "name": "_nsubrecs",
16
+ "type": "Int32",
17
+ "vector": false
18
+ }
19
+ ],
8
20
  "records": [
9
21
  [
10
- "Groonga overview"
11
- ],
12
- [
13
- "Groonga library"
14
- ],
15
- [
16
- "Groonga server"
22
+ "Groonga",
23
+ 3
17
24
  ],
18
25
  [
19
- "Groonga storage engine"
20
- ]
21
- ]
22
- },
23
- "documents": {
24
- "count": 1,
25
- "records": [
26
- [
27
- "Groonga"
26
+ "Mroonga",
27
+ 2
28
28
  ]
29
29
  ]
30
30
  }
data/test/command/suite/search/group/string.test CHANGED
@@ -1,30 +1,75 @@
1
- #@include fixture/documents.jsons
1
+ #@require-catalog-version 2
2
+ #@disable-logging
3
+ {
4
+ "dataset": "Default",
5
+ "type": "add",
6
+ "body": {
7
+ "table": "Sections",
8
+ "key": "groonga-1.1",
9
+ "values": {
10
+ "document": "Groonga",
11
+ "title": "Groonga overview"
12
+ }
13
+ }
14
+ }
15
+ {
16
+ "dataset": "Default",
17
+ "type": "add",
18
+ "body": {
19
+ "table": "Sections",
20
+ "key": "groonga-1.2",
21
+ "values": {
22
+ "document": "Groonga",
23
+ "title": "Full text search and Instant update"
24
+ }
25
+ }
26
+ }
27
+ {
28
+ "dataset": "Default",
29
+ "type": "add",
30
+ "body": {
31
+ "table": "Sections",
32
+ "key": "groonga-1.3",
33
+ "values": {
34
+ "document": "Groonga",
35
+ "title": "Column store and aggregate query"
36
+ }
37
+ }
38
+ }
39
+ {
40
+ "dataset": "Default",
41
+ "type": "add",
42
+ "body": {
43
+ "table": "Sections",
44
+ "key": "mroonga-1.1",
45
+ "values": {
46
+ "document": "Mroonga",
47
+ "title": "What is Mroonga?"
48
+ }
49
+ }
50
+ }
51
+ {
52
+ "dataset": "Default",
53
+ "type": "add",
54
+ "body": {
55
+ "table": "Sections",
56
+ "key": "mroonga-1.2",
57
+ "values": {
58
+ "document": "Mroonga",
59
+ "title": "The successor of Tritonn"
60
+ }
61
+ }
62
+ }
63
+ #@enable-logging
2
64
  {
3
65
  "type": "search",
4
- "dataset": "Droonga",
66
+ "dataset": "Default",
5
67
  "body": {
6
68
  "queries": {
7
- "Groonga": {
8
- "source": "Sections",
9
- "condition": {
10
- "query": "groonga",
11
- "matchTo": ["title"]
12
- },
13
- "sortBy": ["_key"],
14
- "output": {
15
- "elements": [
16
- "count",
17
- "attributes",
18
- "records"
19
- ],
20
- "limit": -1,
21
- "attributes": ["title"]
22
- }
23
- },
24
69
  "documents": {
25
- "source": "Groonga",
70
+ "source": "Sections",
26
71
  "groupBy": "document",
27
- "sortBy": ["-_key"],
72
+ "sortBy": ["-_nsubrecs"],
28
73
  "output": {
29
74
  "elements": [
30
75
  "count",
@@ -32,7 +77,7 @@
32
77
  "records"
33
78
  ],
34
79
  "limit": -1,
35
- "attributes": ["_key"]
80
+ "attributes": ["_key", "_nsubrecs"]
36
81
  }
37
82
  }
38
83
  }
data/test/command/suite/search/group/subrecord/with-sort.catalog.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "datasets": {
3
- "Droonga": {
3
+ "Default": {
4
4
  "fact": "Comments",
5
5
  "schema": {
6
6
  "Threads": {
data/test/command/suite/search/group/subrecord/with-sort.test CHANGED
@@ -3,7 +3,7 @@
3
3
  #@disable-logging
4
4
  {
5
5
  "type": "add",
6
- "dataset": "Droonga",
6
+ "dataset": "Default",
7
7
  "body": {
8
8
  "table": "Threads",
9
9
  "key": "ruby",
@@ -14,7 +14,7 @@
14
14
  }
15
15
  {
16
16
  "type": "add",
17
- "dataset": "Droonga",
17
+ "dataset": "Default",
18
18
  "body": {
19
19
  "table": "Threads",
20
20
  "key": "groonga",
@@ -25,7 +25,7 @@
25
25
  }
26
26
  {
27
27
  "type": "add",
28
- "dataset": "Droonga",
28
+ "dataset": "Default",
29
29
  "body": {
30
30
  "table": "Comments",
31
31
  "key": "1",
@@ -37,7 +37,7 @@
37
37
  }
38
38
  {
39
39
  "type": "add",
40
- "dataset": "Droonga",
40
+ "dataset": "Default",
41
41
  "body": {
42
42
  "table": "Comments",
43
43
  "key": "2",
@@ -50,7 +50,7 @@
50
50
  #@enable-logging
51
51
  {
52
52
  "type": "search",
53
- "dataset": "Droonga",
53
+ "dataset": "Default",
54
54
  "body": {
55
55
  "queries": {
56
56
  "comments": {
data/test/command/suite/search/multiple/chained.catalog.json ADDED
@@ -0,0 +1,37 @@
1
+ {
2
+ "datasets": {
3
+ "Default": {
4
+ "schema": {
5
+ "Sections": {
6
+ "type": "Hash",
7
+ "keyType": "ShortText",
8
+ "columns": {
9
+ "title": {
10
+ "type": "Scalar",
11
+ "valueType": "ShortText"
12
+ }
13
+ }
14
+ },
15
+ "Terms": {
16
+ "type": "PatriciaTrie",
17
+ "keyType": "ShortText",
18
+ "normalizer": "NormalizerAuto",
19
+ "tokenizer": "TokenBigram",
20
+ "columns": {
21
+ "title_index": {
22
+ "type": "Index",
23
+ "valueType": "Sections",
24
+ "indexOptions": {
25
+ "sources": [
26
+ "title"
27
+ ],
28
+ "position": true
29
+ }
30
+ }
31
+ }
32
+ }
33
+ },
34
+ "fact": "Sections"
35
+ }
36
+ }
37
+ }