droonga-engine 1.0.4 → 1.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (216) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +3 -2
  3. data/Gemfile +1 -1
  4. data/LICENSE.txt +1 -1
  5. data/Rakefile +1 -1
  6. data/benchmark/benchmark.rb +1 -1
  7. data/benchmark/utils.rb +1 -1
  8. data/benchmark/watch/benchmark-notify.rb +1 -1
  9. data/benchmark/watch/benchmark-publish.rb +1 -1
  10. data/benchmark/watch/benchmark-scan.rb +1 -1
  11. data/bin/droonga-engine +1 -1
  12. data/bin/droonga-engine-absorb-data +48 -8
  13. data/bin/droonga-engine-catalog-generate +1 -1
  14. data/bin/droonga-engine-catalog-modify +1 -1
  15. data/bin/droonga-engine-data-publisher +66 -0
  16. data/bin/droonga-engine-join +72 -17
  17. data/bin/droonga-engine-serf-event-handler +1 -1
  18. data/bin/droonga-engine-service +1 -1
  19. data/bin/droonga-engine-unjoin +11 -4
  20. data/bin/droonga-engine-worker +20 -0
  21. data/doc/text/news.md +8 -0
  22. data/droonga-engine.gemspec +3 -3
  23. data/lib/droonga/adapter.rb +1 -1
  24. data/lib/droonga/adapter_runner.rb +1 -1
  25. data/lib/droonga/address.rb +69 -0
  26. data/lib/droonga/buffered_tcp_socket.rb +44 -22
  27. data/lib/droonga/catalog/base.rb +1 -1
  28. data/lib/droonga/catalog/collection_volume.rb +1 -1
  29. data/lib/droonga/catalog/dataset.rb +8 -8
  30. data/lib/droonga/catalog/errors.rb +1 -1
  31. data/lib/droonga/catalog/schema.rb +1 -1
  32. data/lib/droonga/catalog/single_volume.rb +6 -8
  33. data/lib/droonga/catalog/slice.rb +1 -1
  34. data/lib/droonga/catalog/version1.rb +2 -2
  35. data/lib/droonga/catalog/version2.rb +6 -6
  36. data/lib/droonga/catalog/version2_validator.rb +1 -1
  37. data/lib/droonga/catalog/volume.rb +1 -1
  38. data/lib/droonga/catalog/volume_collection.rb +2 -2
  39. data/lib/droonga/catalog_generator.rb +49 -53
  40. data/lib/droonga/catalog_loader.rb +1 -1
  41. data/lib/droonga/collector.rb +1 -1
  42. data/lib/droonga/collector_message.rb +1 -1
  43. data/lib/droonga/collector_runner.rb +1 -1
  44. data/lib/droonga/collectors/and.rb +1 -1
  45. data/lib/droonga/collectors/or.rb +1 -1
  46. data/lib/droonga/collectors/sum.rb +1 -1
  47. data/lib/droonga/collectors.rb +1 -1
  48. data/lib/droonga/command/droonga_engine.rb +103 -55
  49. data/lib/droonga/command/droonga_engine_service.rb +22 -67
  50. data/lib/droonga/command/droonga_engine_worker.rb +232 -0
  51. data/lib/droonga/command/serf_event_handler.rb +126 -46
  52. data/lib/droonga/data_absorber.rb +32 -14
  53. data/lib/droonga/dispatcher.rb +15 -11
  54. data/lib/droonga/distributed_command_planner.rb +1 -1
  55. data/lib/droonga/distributor.rb +1 -1
  56. data/lib/droonga/engine/version.rb +2 -2
  57. data/lib/droonga/engine.rb +8 -3
  58. data/lib/droonga/engine_state.rb +15 -6
  59. data/lib/droonga/error.rb +1 -1
  60. data/lib/droonga/error_messages.rb +1 -1
  61. data/lib/droonga/event_loop.rb +1 -1
  62. data/lib/droonga/farm.rb +9 -1
  63. data/lib/droonga/file_observer.rb +1 -1
  64. data/lib/droonga/fluent_message_receiver.rb +11 -5
  65. data/lib/droonga/fluent_message_sender.rb +14 -17
  66. data/lib/droonga/forwarder.rb +23 -13
  67. data/lib/droonga/handler.rb +1 -1
  68. data/lib/droonga/handler_message.rb +1 -1
  69. data/lib/droonga/handler_messenger.rb +2 -2
  70. data/lib/droonga/handler_runner.rb +2 -2
  71. data/lib/droonga/input_message.rb +1 -1
  72. data/lib/droonga/internal_fluent_message_receiver.rb +3 -2
  73. data/lib/droonga/job_protocol.rb +1 -1
  74. data/lib/droonga/job_pusher.rb +1 -1
  75. data/lib/droonga/job_receiver.rb +1 -1
  76. data/lib/droonga/line_buffer.rb +1 -1
  77. data/lib/droonga/live_nodes_list_loader.rb +1 -1
  78. data/lib/droonga/loggable.rb +1 -1
  79. data/lib/droonga/logger.rb +3 -3
  80. data/lib/droonga/message_matcher.rb +1 -1
  81. data/lib/droonga/output_message.rb +1 -1
  82. data/lib/droonga/path.rb +5 -1
  83. data/lib/droonga/planner.rb +1 -1
  84. data/lib/droonga/pluggable.rb +1 -1
  85. data/lib/droonga/plugin/metadata/adapter_input_message.rb +1 -1
  86. data/lib/droonga/plugin/metadata/adapter_output_message.rb +1 -1
  87. data/lib/droonga/plugin/metadata/collector_message.rb +1 -1
  88. data/lib/droonga/plugin/metadata/handler_action.rb +1 -1
  89. data/lib/droonga/plugin/metadata/input_message.rb +1 -1
  90. data/lib/droonga/plugin.rb +2 -1
  91. data/lib/droonga/plugin_loader.rb +1 -1
  92. data/lib/droonga/plugin_registry.rb +3 -1
  93. data/lib/droonga/plugins/basic.rb +1 -1
  94. data/lib/droonga/plugins/crud.rb +1 -1
  95. data/lib/droonga/plugins/dump.rb +13 -2
  96. data/lib/droonga/plugins/error.rb +1 -1
  97. data/lib/droonga/plugins/groonga/column_create.rb +1 -1
  98. data/lib/droonga/plugins/groonga/column_list.rb +1 -1
  99. data/lib/droonga/plugins/groonga/column_remove.rb +1 -1
  100. data/lib/droonga/plugins/groonga/column_rename.rb +1 -1
  101. data/lib/droonga/plugins/groonga/delete.rb +1 -1
  102. data/lib/droonga/plugins/groonga/generic_command.rb +1 -1
  103. data/lib/droonga/plugins/groonga/generic_response.rb +1 -1
  104. data/lib/droonga/plugins/groonga/select.rb +1 -1
  105. data/lib/droonga/plugins/groonga/table_create.rb +1 -1
  106. data/lib/droonga/plugins/groonga/table_list.rb +1 -1
  107. data/lib/droonga/plugins/groonga/table_remove.rb +1 -1
  108. data/lib/droonga/plugins/groonga.rb +1 -1
  109. data/lib/droonga/plugins/search/distributed_search_planner.rb +1 -1
  110. data/lib/droonga/plugins/search.rb +1 -1
  111. data/lib/droonga/plugins/system.rb +1 -1
  112. data/lib/droonga/plugins/watch.rb +1 -1
  113. data/lib/droonga/{service_control_protocol.rb → process_control_protocol.rb} +2 -2
  114. data/lib/droonga/process_supervisor.rb +91 -0
  115. data/lib/droonga/processor.rb +1 -1
  116. data/lib/droonga/reducer.rb +1 -1
  117. data/lib/droonga/replier.rb +2 -2
  118. data/lib/droonga/safe_file_writer.rb +1 -1
  119. data/lib/droonga/schema_applier.rb +1 -1
  120. data/lib/droonga/searcher/mecab_filter.rb +1 -1
  121. data/lib/droonga/searcher.rb +31 -19
  122. data/lib/droonga/serf.rb +81 -14
  123. data/lib/droonga/serf_downloader.rb +2 -2
  124. data/lib/droonga/session.rb +1 -1
  125. data/lib/droonga/single_step.rb +1 -1
  126. data/lib/droonga/single_step_definition.rb +1 -1
  127. data/lib/droonga/slice.rb +30 -28
  128. data/lib/droonga/status_code.rb +1 -1
  129. data/lib/droonga/step_runner.rb +1 -1
  130. data/lib/droonga/supervisor.rb +170 -0
  131. data/lib/droonga/sweeper.rb +1 -1
  132. data/lib/droonga/test/stub_handler.rb +1 -1
  133. data/lib/droonga/test/stub_handler_message.rb +1 -1
  134. data/lib/droonga/test/stub_handler_messenger.rb +1 -1
  135. data/lib/droonga/test/stub_planner.rb +1 -1
  136. data/lib/droonga/test.rb +1 -1
  137. data/lib/droonga/watch_schema.rb +2 -2
  138. data/lib/droonga/watcher.rb +1 -1
  139. data/lib/droonga/worker_process_agent.rb +111 -0
  140. data/sample/cluster/Rakefile +150 -0
  141. data/test/command/config/default/catalog.json +1 -34
  142. data/test/command/config/version1/catalog.json +3 -12
  143. data/test/command/run-test.rb +1 -1
  144. data/test/command/suite/dump/column/index.expected +19 -82
  145. data/test/command/suite/dump/column/scalar.expected +5 -36
  146. data/test/command/suite/dump/column/vector.expected +5 -39
  147. data/test/command/suite/dump/record/vector/reference.expected +24 -93
  148. data/test/command/suite/dump/table/array.expected +0 -19
  149. data/test/command/suite/dump/table/double_array_trie.expected +0 -20
  150. data/test/command/suite/dump/table/hash.expected +0 -20
  151. data/test/command/suite/dump/table/patricia_trie.expected +0 -20
  152. data/test/command/suite/search/condition/query/nonexistent_column.expected +0 -11
  153. data/test/command/suite/search/condition/query/syntax_error.expected +0 -11
  154. data/test/command/suite/search/error/unknown-source.expected +0 -12
  155. data/test/command/suite/search/output/attributes/invalid.expected +0 -10
  156. data/test/command/suite/search/output/attributes/reference_vector.catalog.json +27 -0
  157. data/test/command/suite/search/output/attributes/reference_vector.expected +30 -0
  158. data/test/command/suite/search/output/attributes/reference_vector.test +32 -0
  159. data/test/command/suite/watch/subscribe.catalog.json +23 -0
  160. data/test/command/suite/watch/subscribe.test +2 -0
  161. data/test/command/suite/watch/unsubscribe.catalog.json +23 -0
  162. data/test/command/suite/watch/unsubscribe.test +2 -0
  163. data/test/performance/run-test.rb +1 -1
  164. data/test/unit/catalog/test_collection_volume.rb +1 -1
  165. data/test/unit/catalog/test_dataset.rb +1 -1
  166. data/test/unit/catalog/test_schema.rb +1 -1
  167. data/test/unit/catalog/test_single_volume.rb +27 -19
  168. data/test/unit/catalog/test_slice.rb +2 -2
  169. data/test/unit/catalog/test_version1.rb +1 -1
  170. data/test/unit/catalog/test_version2.rb +1 -1
  171. data/test/unit/catalog/test_version2_validator.rb +1 -1
  172. data/test/unit/catalog/test_volume_collection.rb +1 -1
  173. data/test/unit/helper/distributed_search_planner_helper.rb +1 -1
  174. data/test/unit/helper/fixture.rb +1 -1
  175. data/test/unit/helper/plugin_helper.rb +1 -1
  176. data/test/unit/helper/sandbox.rb +1 -1
  177. data/test/unit/helper/stub_worker.rb +1 -1
  178. data/test/unit/helper/watch_helper.rb +1 -1
  179. data/test/unit/helper.rb +1 -1
  180. data/test/unit/plugins/crud/test_add.rb +1 -1
  181. data/test/unit/plugins/groonga/select/test_adapter_input.rb +1 -1
  182. data/test/unit/plugins/groonga/select/test_adapter_output.rb +1 -1
  183. data/test/unit/plugins/groonga/test_column_create.rb +1 -1
  184. data/test/unit/plugins/groonga/test_column_list.rb +1 -1
  185. data/test/unit/plugins/groonga/test_column_remove.rb +1 -1
  186. data/test/unit/plugins/groonga/test_column_rename.rb +1 -1
  187. data/test/unit/plugins/groonga/test_delete.rb +1 -1
  188. data/test/unit/plugins/groonga/test_table_create.rb +1 -1
  189. data/test/unit/plugins/groonga/test_table_list.rb +1 -1
  190. data/test/unit/plugins/groonga/test_table_remove.rb +1 -1
  191. data/test/unit/plugins/search/planner/test_basic.rb +1 -1
  192. data/test/unit/plugins/search/planner/test_group_by.rb +1 -1
  193. data/test/unit/plugins/search/planner/test_output.rb +1 -1
  194. data/test/unit/plugins/search/planner/test_sort_by.rb +1 -1
  195. data/test/unit/plugins/search/test_collector.rb +1 -1
  196. data/test/unit/plugins/search/test_handler.rb +1 -1
  197. data/test/unit/plugins/search/test_planner.rb +1 -1
  198. data/test/unit/plugins/system/test_status.rb +1 -1
  199. data/test/unit/plugins/test_basic.rb +1 -1
  200. data/test/unit/plugins/test_groonga.rb +1 -1
  201. data/test/unit/plugins/test_watch.rb +1 -1
  202. data/test/unit/run-test.rb +1 -1
  203. data/test/unit/test_address.rb +53 -0
  204. data/test/unit/test_catalog_generator.rb +59 -1
  205. data/test/unit/test_line_buffer.rb +1 -1
  206. data/test/unit/test_message_matcher.rb +1 -1
  207. data/test/unit/test_schema_applier.rb +1 -1
  208. data/test/unit/test_sweeper.rb +1 -1
  209. data/test/unit/test_watch_schema.rb +1 -1
  210. data/test/unit/test_watcher.rb +1 -1
  211. metadata +39 -24
  212. data/lib/droonga/server.rb +0 -45
  213. data/lib/droonga/worker.rb +0 -66
  214. data/sample/cluster/catalog.json +0 -42
  215. data/test/command/config/default/fluentd.conf +0 -11
  216. data/test/command/config/version1/fluentd.conf +0 -11
data/test/command/config/default/catalog.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "effectiveDate": "2014-02-28T00:00:00Z",
4
4
  "datasets": {
5
5
  "Default": {
6
- "nWorkers": 4,
6
+ "nWorkers": 2,
7
7
  "plugins": ["groonga", "crud", "search", "dump", "system"],
8
8
  "replicas": [
9
9
  {
@@ -23,13 +23,6 @@
23
23
  "volume": {
24
24
  "address": "127.0.0.1:23003/droonga.001"
25
25
  }
26
- },
27
- {
28
- "label": "slice002",
29
- "weight": 50,
30
- "volume": {
31
- "address": "127.0.0.1:23003/droonga.002"
32
- }
33
26
  }
34
27
  ]
35
28
  },
@@ -50,32 +43,6 @@
50
43
  "volume": {
51
44
  "address": "127.0.0.1:23003/droonga.011"
52
45
  }
53
- },
54
- {
55
- "label": "slice012",
56
- "weight": 50,
57
- "volume": {
58
- "address": "127.0.0.1:23003/droonga.012"
59
- }
60
- }
61
- ]
62
- }
63
- ]
64
- },
65
- "Watch": {
66
- "nWorkers": 4,
67
- "plugins": ["groonga", "watch", "search", "crud"],
68
- "replicas": [
69
- {
70
- "dimension": "_key",
71
- "slicer": "hash",
72
- "slices": [
73
- {
74
- "label": "slice100",
75
- "weight": 50,
76
- "volume": {
77
- "address": "127.0.0.1:23003/droonga.watch"
78
- }
79
46
  }
80
47
  ]
81
48
  }
data/test/command/config/version1/catalog.json CHANGED
@@ -10,10 +10,10 @@
10
10
  },
11
11
  "datasets": {
12
12
  "Default": {
13
- "workers": 4,
13
+ "workers": 2,
14
14
  "plugins": ["groonga", "crud", "search", "dump", "system"],
15
15
  "number_of_replicas": 2,
16
- "number_of_partitions": 3,
16
+ "number_of_partitions": 2,
17
17
  "partition_key": "_key",
18
18
  "date_range": "infinity",
19
19
  "ring": {
@@ -34,20 +34,11 @@
34
34
  "127.0.0.1:23003/droonga.011"
35
35
  ]
36
36
  }
37
- },
38
- "127.0.0.1:23043": {
39
- "weight": 50,
40
- "partitions": {
41
- "2013-09-01": [
42
- "127.0.0.1:23003/droonga.020",
43
- "127.0.0.1:23003/droonga.021"
44
- ]
45
- }
46
37
  }
47
38
  }
48
39
  },
49
40
  "Watch": {
50
- "workers": 4,
41
+ "workers": 2,
51
42
  "plugins": ["groonga", "watch", "search", "crud", "dump", "system"],
52
43
  "number_of_replicas": 1,
53
44
  "number_of_partitions": 1,
data/test/command/run-test.rb CHANGED
@@ -13,7 +13,7 @@
13
13
  #
14
14
  # You should have received a copy of the GNU Lesser General Public
15
15
  # License along with this library; if not, write to the Free Software
16
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
  require "rbconfig"
19
19
  require "fileutils"
data/test/command/suite/dump/column/index.expected CHANGED
@@ -8,11 +8,6 @@
8
8
  "dataset": "Default",
9
9
  "type": "dump.start"
10
10
  }
11
- {
12
- "inReplyTo": "request-id",
13
- "dataset": "Default",
14
- "type": "dump.start"
15
- }
16
11
  {
17
12
  "inReplyTo": "request-id",
18
13
  "statusCode": 200,
@@ -33,12 +28,11 @@
33
28
  "inReplyTo": "request-id",
34
29
  "dataset": "Default",
35
30
  "body": {
36
- "table": "Memos",
37
- "name": "content",
38
- "type": "Scalar",
39
- "valueType": "ShortText"
31
+ "type": "Hash",
32
+ "name": "Memos",
33
+ "keyType": "ShortText"
40
34
  },
41
- "type": "dump.column"
35
+ "type": "dump.table"
42
36
  }
43
37
  {
44
38
  "inReplyTo": "request-id",
@@ -56,34 +50,11 @@
56
50
  "inReplyTo": "request-id",
57
51
  "dataset": "Default",
58
52
  "body": {
59
- "table": "Terms",
60
- "name": "Memos__key_content",
61
- "type": "Index",
62
- "valueType": "Memos",
63
- "indexOptions": {
64
- "section": true,
65
- "weight": true,
66
- "position": true,
67
- "sources": [
68
- "_key",
69
- "content"
70
- ]
71
- }
72
- },
73
- "type": "dump.column"
74
- }
75
- {
76
- "inReplyTo": "request-id",
77
- "dataset": "Default",
78
- "type": "dump.end"
79
- }
80
- {
81
- "inReplyTo": "request-id",
82
- "dataset": "Default",
83
- "body": {
84
- "type": "Hash",
85
- "name": "Memos",
86
- "keyType": "ShortText"
53
+ "type": "PatriciaTrie",
54
+ "name": "Terms",
55
+ "keyType": "ShortText",
56
+ "tokenizer": "TokenBigram",
57
+ "normalizer": "NormalizerAuto"
87
58
  },
88
59
  "type": "dump.table"
89
60
  }
@@ -102,13 +73,12 @@
102
73
  "inReplyTo": "request-id",
103
74
  "dataset": "Default",
104
75
  "body": {
105
- "type": "PatriciaTrie",
106
- "name": "Terms",
107
- "keyType": "ShortText",
108
- "tokenizer": "TokenBigram",
109
- "normalizer": "NormalizerAuto"
76
+ "table": "Memos",
77
+ "name": "content",
78
+ "type": "Scalar",
79
+ "valueType": "ShortText"
110
80
  },
111
- "type": "dump.table"
81
+ "type": "dump.column"
112
82
  }
113
83
  {
114
84
  "inReplyTo": "request-id",
@@ -130,44 +100,6 @@
130
100
  },
131
101
  "type": "dump.column"
132
102
  }
133
- {
134
- "inReplyTo": "request-id",
135
- "dataset": "Default",
136
- "type": "dump.end"
137
- }
138
- {
139
- "inReplyTo": "request-id",
140
- "dataset": "Default",
141
- "body": {
142
- "type": "Hash",
143
- "name": "Memos",
144
- "keyType": "ShortText"
145
- },
146
- "type": "dump.table"
147
- }
148
- {
149
- "inReplyTo": "request-id",
150
- "dataset": "Default",
151
- "body": {
152
- "table": "Memos",
153
- "name": "content",
154
- "type": "Scalar",
155
- "valueType": "ShortText"
156
- },
157
- "type": "dump.column"
158
- }
159
- {
160
- "inReplyTo": "request-id",
161
- "dataset": "Default",
162
- "body": {
163
- "type": "PatriciaTrie",
164
- "name": "Terms",
165
- "keyType": "ShortText",
166
- "tokenizer": "TokenBigram",
167
- "normalizer": "NormalizerAuto"
168
- },
169
- "type": "dump.table"
170
- }
171
103
  {
172
104
  "inReplyTo": "request-id",
173
105
  "dataset": "Default",
@@ -193,3 +125,8 @@
193
125
  "dataset": "Default",
194
126
  "type": "dump.end"
195
127
  }
128
+ {
129
+ "inReplyTo": "request-id",
130
+ "dataset": "Default",
131
+ "type": "dump.end"
132
+ }
data/test/command/suite/dump/column/scalar.expected CHANGED
@@ -8,11 +8,6 @@
8
8
  "dataset": "Default",
9
9
  "type": "dump.start"
10
10
  }
11
- {
12
- "inReplyTo": "request-id",
13
- "dataset": "Default",
14
- "type": "dump.start"
15
- }
16
11
  {
17
12
  "inReplyTo": "request-id",
18
13
  "statusCode": 200,
@@ -29,22 +24,6 @@
29
24
  },
30
25
  "type": "dump.table"
31
26
  }
32
- {
33
- "inReplyTo": "request-id",
34
- "dataset": "Default",
35
- "body": {
36
- "table": "Memos",
37
- "name": "title",
38
- "type": "Scalar",
39
- "valueType": "ShortText"
40
- },
41
- "type": "dump.column"
42
- }
43
- {
44
- "inReplyTo": "request-id",
45
- "dataset": "Default",
46
- "type": "dump.end"
47
- }
48
27
  {
49
28
  "inReplyTo": "request-id",
50
29
  "dataset": "Default",
@@ -66,21 +45,6 @@
66
45
  },
67
46
  "type": "dump.column"
68
47
  }
69
- {
70
- "inReplyTo": "request-id",
71
- "dataset": "Default",
72
- "type": "dump.end"
73
- }
74
- {
75
- "inReplyTo": "request-id",
76
- "dataset": "Default",
77
- "body": {
78
- "type": "Hash",
79
- "name": "Memos",
80
- "keyType": "ShortText"
81
- },
82
- "type": "dump.table"
83
- }
84
48
  {
85
49
  "inReplyTo": "request-id",
86
50
  "dataset": "Default",
@@ -97,3 +61,8 @@
97
61
  "dataset": "Default",
98
62
  "type": "dump.end"
99
63
  }
64
+ {
65
+ "inReplyTo": "request-id",
66
+ "dataset": "Default",
67
+ "type": "dump.end"
68
+ }
data/test/command/suite/dump/column/vector.expected CHANGED
@@ -8,11 +8,6 @@
8
8
  "dataset": "Default",
9
9
  "type": "dump.start"
10
10
  }
11
- {
12
- "inReplyTo": "request-id",
13
- "dataset": "Default",
14
- "type": "dump.start"
15
- }
16
11
  {
17
12
  "inReplyTo": "request-id",
18
13
  "statusCode": 200,
@@ -29,25 +24,6 @@
29
24
  },
30
25
  "type": "dump.table"
31
26
  }
32
- {
33
- "inReplyTo": "request-id",
34
- "dataset": "Default",
35
- "body": {
36
- "table": "Memos",
37
- "name": "tags",
38
- "type": "Vector",
39
- "valueType": "ShortText",
40
- "vectorOptions": {
41
- "weight": true
42
- }
43
- },
44
- "type": "dump.column"
45
- }
46
- {
47
- "inReplyTo": "request-id",
48
- "dataset": "Default",
49
- "type": "dump.end"
50
- }
51
27
  {
52
28
  "inReplyTo": "request-id",
53
29
  "dataset": "Default",
@@ -72,21 +48,6 @@
72
48
  },
73
49
  "type": "dump.column"
74
50
  }
75
- {
76
- "inReplyTo": "request-id",
77
- "dataset": "Default",
78
- "type": "dump.end"
79
- }
80
- {
81
- "inReplyTo": "request-id",
82
- "dataset": "Default",
83
- "body": {
84
- "type": "Hash",
85
- "name": "Memos",
86
- "keyType": "ShortText"
87
- },
88
- "type": "dump.table"
89
- }
90
51
  {
91
52
  "inReplyTo": "request-id",
92
53
  "dataset": "Default",
@@ -106,3 +67,8 @@
106
67
  "dataset": "Default",
107
68
  "type": "dump.end"
108
69
  }
70
+ {
71
+ "inReplyTo": "request-id",
72
+ "dataset": "Default",
73
+ "type": "dump.end"
74
+ }
data/test/command/suite/dump/record/vector/reference.expected CHANGED
@@ -8,11 +8,6 @@
8
8
  "dataset": "Default",
9
9
  "type": "dump.start"
10
10
  }
11
- {
12
- "inReplyTo": "request-id",
13
- "dataset": "Default",
14
- "type": "dump.start"
15
- }
16
11
  {
17
12
  "inReplyTo": "request-id",
18
13
  "statusCode": 200,
@@ -33,15 +28,11 @@
33
28
  "inReplyTo": "request-id",
34
29
  "dataset": "Default",
35
30
  "body": {
36
- "table": "Memos",
37
- "name": "tags",
38
- "type": "Vector",
39
- "valueType": "Tags",
40
- "vectorOptions": {
41
- "weight": false
42
- }
31
+ "type": "Hash",
32
+ "name": "Memos",
33
+ "keyType": "ShortText"
43
34
  },
44
- "type": "dump.column"
35
+ "type": "dump.table"
45
36
  }
46
37
  {
47
38
  "inReplyTo": "request-id",
@@ -57,8 +48,8 @@
57
48
  "inReplyTo": "request-id",
58
49
  "dataset": "Default",
59
50
  "body": {
60
- "type": "Hash",
61
- "name": "Users",
51
+ "type": "PatriciaTrie",
52
+ "name": "Tags",
62
53
  "keyType": "ShortText"
63
54
  },
64
55
  "type": "dump.table"
@@ -67,28 +58,18 @@
67
58
  "inReplyTo": "request-id",
68
59
  "dataset": "Default",
69
60
  "body": {
70
- "table": "Memos",
71
- "key": "Groonga newbie",
72
- "values": {
73
- "tags": [
74
- "Groonga",
75
- "column store"
76
- ]
77
- }
61
+ "type": "Hash",
62
+ "name": "Users",
63
+ "keyType": "ShortText"
78
64
  },
79
- "type": "dump.record"
80
- }
81
- {
82
- "inReplyTo": "request-id",
83
- "dataset": "Default",
84
- "type": "dump.end"
65
+ "type": "dump.table"
85
66
  }
86
67
  {
87
68
  "inReplyTo": "request-id",
88
69
  "dataset": "Default",
89
70
  "body": {
90
71
  "type": "Hash",
91
- "name": "Memos",
72
+ "name": "Users",
92
73
  "keyType": "ShortText"
93
74
  },
94
75
  "type": "dump.table"
@@ -111,21 +92,15 @@
111
92
  "inReplyTo": "request-id",
112
93
  "dataset": "Default",
113
94
  "body": {
114
- "type": "PatriciaTrie",
115
- "name": "Tags",
116
- "keyType": "ShortText"
117
- },
118
- "type": "dump.table"
119
- }
120
- {
121
- "inReplyTo": "request-id",
122
- "dataset": "Default",
123
- "body": {
124
- "type": "Hash",
125
- "name": "Users",
126
- "keyType": "ShortText"
95
+ "table": "Memos",
96
+ "name": "tags",
97
+ "type": "Vector",
98
+ "valueType": "Tags",
99
+ "vectorOptions": {
100
+ "weight": false
101
+ }
127
102
  },
128
- "type": "dump.table"
103
+ "type": "dump.column"
129
104
  }
130
105
  {
131
106
  "inReplyTo": "request-id",
@@ -142,55 +117,6 @@
142
117
  },
143
118
  "type": "dump.record"
144
119
  }
145
- {
146
- "inReplyTo": "request-id",
147
- "dataset": "Default",
148
- "type": "dump.end"
149
- }
150
- {
151
- "inReplyTo": "request-id",
152
- "dataset": "Default",
153
- "body": {
154
- "type": "Hash",
155
- "name": "Memos",
156
- "keyType": "ShortText"
157
- },
158
- "type": "dump.table"
159
- }
160
- {
161
- "inReplyTo": "request-id",
162
- "dataset": "Default",
163
- "body": {
164
- "table": "Memos",
165
- "name": "tags",
166
- "type": "Vector",
167
- "valueType": "Tags",
168
- "vectorOptions": {
169
- "weight": false
170
- }
171
- },
172
- "type": "dump.column"
173
- }
174
- {
175
- "inReplyTo": "request-id",
176
- "dataset": "Default",
177
- "body": {
178
- "type": "PatriciaTrie",
179
- "name": "Tags",
180
- "keyType": "ShortText"
181
- },
182
- "type": "dump.table"
183
- }
184
- {
185
- "inReplyTo": "request-id",
186
- "dataset": "Default",
187
- "body": {
188
- "type": "Hash",
189
- "name": "Users",
190
- "keyType": "ShortText"
191
- },
192
- "type": "dump.table"
193
- }
194
120
  {
195
121
  "inReplyTo": "request-id",
196
122
  "dataset": "Default",
@@ -211,3 +137,8 @@
211
137
  "dataset": "Default",
212
138
  "type": "dump.end"
213
139
  }
140
+ {
141
+ "inReplyTo": "request-id",
142
+ "dataset": "Default",
143
+ "type": "dump.end"
144
+ }
data/test/command/suite/dump/table/array.expected CHANGED
@@ -8,11 +8,6 @@
8
8
  "dataset": "Default",
9
9
  "type": "dump.start"
10
10
  }
11
- {
12
- "inReplyTo": "request-id",
13
- "dataset": "Default",
14
- "type": "dump.start"
15
- }
16
11
  {
17
12
  "inReplyTo": "request-id",
18
13
  "statusCode": 200,
@@ -28,11 +23,6 @@
28
23
  },
29
24
  "type": "dump.table"
30
25
  }
31
- {
32
- "inReplyTo": "request-id",
33
- "dataset": "Default",
34
- "type": "dump.end"
35
- }
36
26
  {
37
27
  "inReplyTo": "request-id",
38
28
  "dataset": "Default",
@@ -47,15 +37,6 @@
47
37
  "dataset": "Default",
48
38
  "type": "dump.end"
49
39
  }
50
- {
51
- "inReplyTo": "request-id",
52
- "dataset": "Default",
53
- "body": {
54
- "type": "Array",
55
- "name": "Logs"
56
- },
57
- "type": "dump.table"
58
- }
59
40
  {
60
41
  "inReplyTo": "request-id",
61
42
  "dataset": "Default",
data/test/command/suite/dump/table/double_array_trie.expected CHANGED
@@ -8,11 +8,6 @@
8
8
  "dataset": "Default",
9
9
  "type": "dump.start"
10
10
  }
11
- {
12
- "inReplyTo": "request-id",
13
- "dataset": "Default",
14
- "type": "dump.start"
15
- }
16
11
  {
17
12
  "inReplyTo": "request-id",
18
13
  "statusCode": 200,
@@ -29,11 +24,6 @@
29
24
  },
30
25
  "type": "dump.table"
31
26
  }
32
- {
33
- "inReplyTo": "request-id",
34
- "dataset": "Default",
35
- "type": "dump.end"
36
- }
37
27
  {
38
28
  "inReplyTo": "request-id",
39
29
  "dataset": "Default",
@@ -49,16 +39,6 @@
49
39
  "dataset": "Default",
50
40
  "type": "dump.end"
51
41
  }
52
- {
53
- "inReplyTo": "request-id",
54
- "dataset": "Default",
55
- "body": {
56
- "type": "DoubleArrayTrie",
57
- "name": "Memos",
58
- "keyType": "ShortText"
59
- },
60
- "type": "dump.table"
61
- }
62
42
  {
63
43
  "inReplyTo": "request-id",
64
44
  "dataset": "Default",
data/test/command/suite/dump/table/hash.expected CHANGED
@@ -8,11 +8,6 @@
8
8
  "dataset": "Default",
9
9
  "type": "dump.start"
10
10
  }
11
- {
12
- "inReplyTo": "request-id",
13
- "dataset": "Default",
14
- "type": "dump.start"
15
- }
16
11
  {
17
12
  "inReplyTo": "request-id",
18
13
  "statusCode": 200,
@@ -29,11 +24,6 @@
29
24
  },
30
25
  "type": "dump.table"
31
26
  }
32
- {
33
- "inReplyTo": "request-id",
34
- "dataset": "Default",
35
- "type": "dump.end"
36
- }
37
27
  {
38
28
  "inReplyTo": "request-id",
39
29
  "dataset": "Default",
@@ -49,16 +39,6 @@
49
39
  "dataset": "Default",
50
40
  "type": "dump.end"
51
41
  }
52
- {
53
- "inReplyTo": "request-id",
54
- "dataset": "Default",
55
- "body": {
56
- "type": "Hash",
57
- "name": "Memos",
58
- "keyType": "ShortText"
59
- },
60
- "type": "dump.table"
61
- }
62
42
  {
63
43
  "inReplyTo": "request-id",
64
44
  "dataset": "Default",