Kouhei Sutou
null+****@clear*****
Tue Jul 15 23:14:35 JST 2014
Kouhei Sutou 2014-07-15 23:14:35 +0900 (Tue, 15 Jul 2014) New Revision: 7e377ddb2938d8d4f3e1ffb4a79c9721849ad6c0 https://github.com/droonga/droonga-engine/commit/7e377ddb2938d8d4f3e1ffb4a79c9721849ad6c0 Message: test: follow drntest change about sorting dump responses Modified files: test/command/suite/dump/column/index.expected test/command/suite/dump/column/scalar.expected test/command/suite/dump/column/vector.expected test/command/suite/dump/record/vector/reference.expected test/command/suite/dump/table/array.expected test/command/suite/dump/table/double_array_trie.expected test/command/suite/dump/table/hash.expected test/command/suite/dump/table/patricia_trie.expected Modified: test/command/suite/dump/column/index.expected (+61 -61) =================================================================== --- test/command/suite/dump/column/index.expected 2014-07-15 19:25:13 +0900 (3b35130) +++ test/command/suite/dump/column/index.expected 2014-07-15 23:14:35 +0900 (bfd902e) @@ -33,12 +33,21 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "table": "Memos", - "name": "content", - "type": "Scalar", - "valueType": "ShortText" + "type": "Hash", + "name": "Memos", + "keyType": "ShortText" }, - "type": "dump.column" + "type": "dump.table" +} +{ + "inReplyTo": "request-id", + "dataset": "Default", + "body": { + "type": "Hash", + "name": "Memos", + "keyType": "ShortText" + }, + "type": "dump.table" } { "inReplyTo": "request-id", @@ -56,36 +65,36 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "table": "Terms", - "name": "Memos__key_content", - "type": "Index", - "valueType": "Memos", - "indexOptions": { - "section": true, - "weight": true, - "position": true, - "sources": [ - "_key", - "content" - ] - } + "type": "PatriciaTrie", + "name": "Terms", + "keyType": "ShortText", + "tokenizer": "TokenBigram", + "normalizer": "NormalizerAuto" }, - "type": "dump.column" + "type": "dump.table" } { "inReplyTo": "request-id", "dataset": "Default", - "type": "dump.end" + "body": { + "type": "PatriciaTrie", + "name": "Terms", + "keyType": "ShortText", + "tokenizer": "TokenBigram", + "normalizer": "NormalizerAuto" + }, + "type": "dump.table" } { "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "Hash", - "name": "Memos", - "keyType": "ShortText" + "table": "Memos", + "name": "content", + "type": "Scalar", + "valueType": "ShortText" }, - "type": "dump.table" + "type": "dump.column" } { "inReplyTo": "request-id", @@ -102,13 +111,12 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "PatriciaTrie", - "name": "Terms", - "keyType": "ShortText", - "tokenizer": "TokenBigram", - "normalizer": "NormalizerAuto" + "table": "Memos", + "name": "content", + "type": "Scalar", + "valueType": "ShortText" }, - "type": "dump.table" + "type": "dump.column" } { "inReplyTo": "request-id", @@ -133,26 +141,20 @@ { "inReplyTo": "request-id", "dataset": "Default", - "type": "dump.end" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", "body": { - "type": "Hash", - "name": "Memos", - "keyType": "ShortText" - }, - "type": "dump.table" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", - "body": { - "table": "Memos", - "name": "content", - "type": "Scalar", - "valueType": "ShortText" + "table": "Terms", + "name": "Memos__key_content", + "type": "Index", + "valueType": "Memos", + "indexOptions": { + "section": true, + "weight": true, + "position": true, + "sources": [ + "_key", + "content" + ] + } }, "type": "dump.column" } @@ -160,18 +162,6 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "PatriciaTrie", - "name": "Terms", - "keyType": "ShortText", - "tokenizer": "TokenBigram", - "normalizer": "NormalizerAuto" - }, - "type": "dump.table" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", - "body": { "table": "Terms", "name": "Memos__key_content", "type": "Index", @@ -193,3 +183,13 @@ "dataset": "Default", "type": "dump.end" } +{ + "inReplyTo": "request-id", + "dataset": "Default", + "type": "dump.end" +} +{ + "inReplyTo": "request-id", + "dataset": "Default", + "type": "dump.end" +} Modified: test/command/suite/dump/column/scalar.expected (+19 -19) =================================================================== --- test/command/suite/dump/column/scalar.expected 2014-07-15 19:25:13 +0900 (d6b5128) +++ test/command/suite/dump/column/scalar.expected 2014-07-15 23:14:35 +0900 (01ae4a6) @@ -33,17 +33,11 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "table": "Memos", - "name": "title", - "type": "Scalar", - "valueType": "ShortText" + "type": "Hash", + "name": "Memos", + "keyType": "ShortText" }, - "type": "dump.column" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", - "type": "dump.end" + "type": "dump.table" } { "inReplyTo": "request-id", @@ -69,17 +63,13 @@ { "inReplyTo": "request-id", "dataset": "Default", - "type": "dump.end" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", "body": { - "type": "Hash", - "name": "Memos", - "keyType": "ShortText" + "table": "Memos", + "name": "title", + "type": "Scalar", + "valueType": "ShortText" }, - "type": "dump.table" + "type": "dump.column" } { "inReplyTo": "request-id", @@ -97,3 +87,13 @@ "dataset": "Default", "type": "dump.end" } +{ + "inReplyTo": "request-id", + "dataset": "Default", + "type": "dump.end" +} +{ + "inReplyTo": "request-id", + "dataset": "Default", + "type": "dump.end" +} Modified: test/command/suite/dump/column/vector.expected (+22 -22) =================================================================== --- test/command/suite/dump/column/vector.expected 2014-07-15 19:25:13 +0900 (b3cd492) +++ test/command/suite/dump/column/vector.expected 2014-07-15 23:14:35 +0900 (3c6beaf) @@ -33,20 +33,11 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "table": "Memos", - "name": "tags", - "type": "Vector", - "valueType": "ShortText", - "vectorOptions": { - "weight": true - } + "type": "Hash", + "name": "Memos", + "keyType": "ShortText" }, - "type": "dump.column" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", - "type": "dump.end" + "type": "dump.table" } { "inReplyTo": "request-id", @@ -75,17 +66,16 @@ { "inReplyTo": "request-id", "dataset": "Default", - "type": "dump.end" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", "body": { - "type": "Hash", - "name": "Memos", - "keyType": "ShortText" + "table": "Memos", + "name": "tags", + "type": "Vector", + "valueType": "ShortText", + "vectorOptions": { + "weight": true + } }, - "type": "dump.table" + "type": "dump.column" } { "inReplyTo": "request-id", @@ -106,3 +96,13 @@ "dataset": "Default", "type": "dump.end" } +{ + "inReplyTo": "request-id", + "dataset": "Default", + "type": "dump.end" +} +{ + "inReplyTo": "request-id", + "dataset": "Default", + "type": "dump.end" +} Modified: test/command/suite/dump/record/vector/reference.expected (+62 -62) =================================================================== --- test/command/suite/dump/record/vector/reference.expected 2014-07-15 19:25:13 +0900 (9b5c367) +++ test/command/suite/dump/record/vector/reference.expected 2014-07-15 23:14:35 +0900 (f6036ef) @@ -33,22 +33,18 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "table": "Memos", - "name": "tags", - "type": "Vector", - "valueType": "Tags", - "vectorOptions": { - "weight": false - } + "type": "Hash", + "name": "Memos", + "keyType": "ShortText" }, - "type": "dump.column" + "type": "dump.table" } { "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "PatriciaTrie", - "name": "Tags", + "type": "Hash", + "name": "Memos", "keyType": "ShortText" }, "type": "dump.table" @@ -57,8 +53,8 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "Hash", - "name": "Users", + "type": "PatriciaTrie", + "name": "Tags", "keyType": "ShortText" }, "type": "dump.table" @@ -67,28 +63,18 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "table": "Memos", - "key": "Groonga newbie", - "values": { - "tags": [ - "Groonga", - "column store" - ] - } + "type": "PatriciaTrie", + "name": "Tags", + "keyType": "ShortText" }, - "type": "dump.record" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", - "type": "dump.end" + "type": "dump.table" } { "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "Hash", - "name": "Memos", + "type": "PatriciaTrie", + "name": "Tags", "keyType": "ShortText" }, "type": "dump.table" @@ -97,22 +83,18 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "table": "Memos", - "name": "tags", - "type": "Vector", - "valueType": "Tags", - "vectorOptions": { - "weight": false - } + "type": "Hash", + "name": "Users", + "keyType": "ShortText" }, - "type": "dump.column" + "type": "dump.table" } { "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "PatriciaTrie", - "name": "Tags", + "type": "Hash", + "name": "Users", "keyType": "ShortText" }, "type": "dump.table" @@ -132,30 +114,28 @@ "dataset": "Default", "body": { "table": "Memos", - "key": "Groonga newbie", - "values": { - "tags": [ - "Groonga", - "column store" - ] + "name": "tags", + "type": "Vector", + "valueType": "Tags", + "vectorOptions": { + "weight": false } }, - "type": "dump.record" -} -{ - "inReplyTo": "request-id", - "dataset": "Default", - "type": "dump.end" + "type": "dump.column" } { "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "Hash", - "name": "Memos", - "keyType": "ShortText" + "table": "Memos", + "name": "tags", + "type": "Vector", + "valueType": "Tags", + "vectorOptions": { + "weight": false + } }, - "type": "dump.table" + "type": "dump.column" } { "inReplyTo": "request-id", @@ -175,21 +155,31 @@ "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "PatriciaTrie", - "name": "Tags", - "keyType": "ShortText" + "table": "Memos", + "key": "Groonga newbie", + "values": { + "tags": [ + "Groonga", + "column store" + ] + } }, - "type": "dump.table" + "type": "dump.record" } { "inReplyTo": "request-id", "dataset": "Default", "body": { - "type": "Hash", - "name": "Users", - "keyType": "ShortText" + "table": "Memos", + "key": "Groonga newbie", + "values": { + "tags": [ + "Groonga", + "column store" + ] + } }, - "type": "dump.table" + "type": "dump.record" } { "inReplyTo": "request-id", @@ -211,3 +201,13 @@ "dataset": "Default", "type": "dump.end" } +{ + "inReplyTo": "request-id", + "dataset": "Default", + "type": "dump.end" +} +{ + "inReplyTo": "request-id", + "dataset": "Default", + "type": "dump.end" +} Modified: test/command/suite/dump/table/array.expected (+6 -6) =================================================================== --- test/command/suite/dump/table/array.expected 2014-07-15 19:25:13 +0900 (b216bf2) +++ test/command/suite/dump/table/array.expected 2014-07-15 23:14:35 +0900 (36627e0) @@ -31,7 +31,11 @@ { "inReplyTo": "request-id", "dataset": "Default", - "type": "dump.end" + "body": { + "type": "Array", + "name": "Logs" + }, + "type": "dump.table" } { "inReplyTo": "request-id", @@ -50,11 +54,7 @@ { "inReplyTo": "request-id", "dataset": "Default", - "body": { - "type": "Array", - "name": "Logs" - }, - "type": "dump.table" + "type": "dump.end" } { "inReplyTo": "request-id", Modified: test/command/suite/dump/table/double_array_trie.expected (+7 -7) =================================================================== --- test/command/suite/dump/table/double_array_trie.expected 2014-07-15 19:25:13 +0900 (7ea33c4) +++ test/command/suite/dump/table/double_array_trie.expected 2014-07-15 23:14:35 +0900 (7b39c25) @@ -32,7 +32,12 @@ { "inReplyTo": "request-id", "dataset": "Default", - "type": "dump.end" + "body": { + "type": "DoubleArrayTrie", + "name": "Memos", + "keyType": "ShortText" + }, + "type": "dump.table" } { "inReplyTo": "request-id", @@ -52,12 +57,7 @@ { "inReplyTo": "request-id", "dataset": "Default", - "body": { - "type": "DoubleArrayTrie", - "name": "Memos", - "keyType": "ShortText" - }, - "type": "dump.table" + "type": "dump.end" } { "inReplyTo": "request-id", Modified: test/command/suite/dump/table/hash.expected (+7 -7) =================================================================== --- test/command/suite/dump/table/hash.expected 2014-07-15 19:25:13 +0900 (ea7ebbb) +++ test/command/suite/dump/table/hash.expected 2014-07-15 23:14:35 +0900 (3612411) @@ -32,7 +32,12 @@ { "inReplyTo": "request-id", "dataset": "Default", - "type": "dump.end" + "body": { + "type": "Hash", + "name": "Memos", + "keyType": "ShortText" + }, + "type": "dump.table" } { "inReplyTo": "request-id", @@ -52,12 +57,7 @@ { "inReplyTo": "request-id", "dataset": "Default", - "body": { - "type": "Hash", - "name": "Memos", - "keyType": "ShortText" - }, - "type": "dump.table" + "type": "dump.end" } { "inReplyTo": "request-id", Modified: test/command/suite/dump/table/patricia_trie.expected (+7 -7) =================================================================== --- test/command/suite/dump/table/patricia_trie.expected 2014-07-15 19:25:13 +0900 (f7d5dcd) +++ test/command/suite/dump/table/patricia_trie.expected 2014-07-15 23:14:35 +0900 (fe71a19) @@ -32,7 +32,12 @@ { "inReplyTo": "request-id", "dataset": "Default", - "type": "dump.end" + "body": { + "type": "PatriciaTrie", + "name": "Memos", + "keyType": "ShortText" + }, + "type": "dump.table" } { "inReplyTo": "request-id", @@ -52,12 +57,7 @@ { "inReplyTo": "request-id", "dataset": "Default", - "body": { - "type": "PatriciaTrie", - "name": "Memos", - "keyType": "ShortText" - }, - "type": "dump.table" + "type": "dump.end" } { "inReplyTo": "request-id", -------------- next part -------------- HTML����������������������������...Download