Groonga - fulltext search engine.

[Groonga-commit] droonga/droonga-engine at 9c09932 [master] Reduce the number of workers

Kouhei Sutou null+****@clear*****
Mon Jul 21 11:05:47 JST 2014

• Previous message: [Groonga-commit] droonga/droonga-engine at 7bc0382 [master] dump: add TODO
• Next message: [Groonga-commit] Still Failing: droonga/droonga-engine#462 (master - 7bc0382)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Kouhei Sutou	2014-07-21 11:05:47 +0900 (Mon, 21 Jul 2014)

  New Revision: 9c0993259b37aef237ee30aa795a392e5b6f4a89
  https://github.com/droonga/droonga-engine/commit/9c0993259b37aef237ee30aa795a392e5b6f4a89

  Message:
    Reduce the number of workers
    
    It is for reducing resources for a test.
    
    It is better the the current configuration because all parameters use
    different values like the following:
    
      * The number of workers is 4.
      * The number of slices is 3.
      * The number of replications is 2.
    
    But it requires 12 worker processes (= 4 * 3 * 2) for a test. It is
    resource overuse.

  Added files:
    test/command/suite/watch/subscribe.catalog.json
    test/command/suite/watch/unsubscribe.catalog.json
  Modified files:
    test/command/config/default/catalog.json
    test/command/config/version1/catalog.json
    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
    test/command/suite/search/condition/query/nonexistent_column.expected
    test/command/suite/search/condition/query/syntax_error.expected
    test/command/suite/search/error/unknown-source.expected
    test/command/suite/search/output/attributes/invalid.expected
    test/command/suite/watch/subscribe.test
    test/command/suite/watch/unsubscribe.test

  Modified: test/command/config/default/catalog.json (+1 -34)
===================================================================
--- test/command/config/default/catalog.json    2014-07-21 10:50:07 +0900 (4a29cf1)
+++ test/command/config/default/catalog.json    2014-07-21 11:05:47 +0900 (5909a61)
@@ -3,7 +3,7 @@
   "effectiveDate": "2014-02-28T00:00:00Z",
   "datasets": {
     "Default": {
-      "nWorkers": 4,
+      "nWorkers": 2,
       "plugins": ["groonga", "crud", "search", "dump", "system"],
       "replicas": [
         {
@@ -23,13 +23,6 @@
               "volume": {
                 "address": "127.0.0.1:23003/droonga.001"
               }
-            },
-            {
-              "label": "slice002",
-              "weight": 50,
-              "volume": {
-                "address": "127.0.0.1:23003/droonga.002"
-              }
             }
           ]
         },
@@ -50,32 +43,6 @@
               "volume": {
                 "address": "127.0.0.1:23003/droonga.011"
               }
-            },
-            {
-              "label": "slice012",
-              "weight": 50,
-              "volume": {
-                "address": "127.0.0.1:23003/droonga.012"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "Watch": {
-      "nWorkers": 4,
-      "plugins": ["groonga", "watch", "search", "crud"],
-      "replicas": [
-        {
-          "dimension": "_key",
-          "slicer": "hash",
-          "slices": [
-            {
-              "label": "slice100",
-              "weight": 50,
-              "volume": {
-                "address": "127.0.0.1:23003/droonga.watch"
-              }
             }
           ]
         }

  Modified: test/command/config/version1/catalog.json (+3 -12)
===================================================================
--- test/command/config/version1/catalog.json    2014-07-21 10:50:07 +0900 (bbdca8e)
+++ test/command/config/version1/catalog.json    2014-07-21 11:05:47 +0900 (a5a28d1)
@@ -10,10 +10,10 @@
   },
   "datasets": {
     "Default": {
-      "workers": 4,
+      "workers": 2,
       "plugins": ["groonga", "crud", "search", "dump", "system"],
       "number_of_replicas": 2,
-      "number_of_partitions": 3,
+      "number_of_partitions": 2,
       "partition_key": "_key",
       "date_range": "infinity",
       "ring": {
@@ -34,20 +34,11 @@
               "127.0.0.1:23003/droonga.011"
             ]
           }
-        },
-        "127.0.0.1:23043": {
-          "weight": 50,
-          "partitions": {
-            "2013-09-01": [
-              "127.0.0.1:23003/droonga.020",
-              "127.0.0.1:23003/droonga.021"
-            ]
-          }
         }
       }
     },
     "Watch": {
-      "workers": 4,
+      "workers": 2,
       "plugins": ["groonga", "watch", "search", "crud", "dump", "system"],
       "number_of_replicas": 1,
       "number_of_partitions": 1,

  Modified: test/command/suite/dump/column/index.expected (+0 -63)
===================================================================
--- test/command/suite/dump/column/index.expected    2014-07-21 10:50:07 +0900 (bfd902e)
+++ test/command/suite/dump/column/index.expected    2014-07-21 11:05:47 +0900 (bcaeb41)
@@ -10,11 +10,6 @@
 }
 {
   "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
-{
-  "inReplyTo": "request-id",
   "statusCode": 200,
   "type": "dump.result",
   "body": true
@@ -43,28 +38,6 @@
   "inReplyTo": "request-id",
   "dataset": "Default",
   "body": {
-    "type": "Hash",
-    "name": "Memos",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "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": {
     "type": "PatriciaTrie",
     "name": "Terms",
     "keyType": "ShortText",
@@ -111,17 +84,6 @@
   "inReplyTo": "request-id",
   "dataset": "Default",
   "body": {
-    "table": "Memos",
-    "name": "content",
-    "type": "Scalar",
-    "valueType": "ShortText"
-  },
-  "type": "dump.column"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
     "table": "Terms",
     "name": "Memos__key_content",
     "type": "Index",
@@ -161,31 +123,6 @@
 {
   "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": "dump.column"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
   "type": "dump.end"
 }
 {

  Modified: test/command/suite/dump/column/scalar.expected (+0 -31)
===================================================================
--- test/command/suite/dump/column/scalar.expected    2014-07-21 10:50:07 +0900 (01ae4a6)
+++ test/command/suite/dump/column/scalar.expected    2014-07-21 11:05:47 +0900 (21f8fdc)
@@ -10,11 +10,6 @@
 }
 {
   "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
-{
-  "inReplyTo": "request-id",
   "statusCode": 200,
   "type": "dump.result",
   "body": true
@@ -43,16 +38,6 @@
   "inReplyTo": "request-id",
   "dataset": "Default",
   "body": {
-    "type": "Hash",
-    "name": "Memos",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
     "table": "Memos",
     "name": "title",
     "type": "Scalar",
@@ -74,22 +59,6 @@
 {
   "inReplyTo": "request-id",
   "dataset": "Default",
-  "body": {
-    "table": "Memos",
-    "name": "title",
-    "type": "Scalar",
-    "valueType": "ShortText"
-  },
-  "type": "dump.column"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
   "type": "dump.end"
 }
 {

  Modified: test/command/suite/dump/column/vector.expected (+0 -34)
===================================================================
--- test/command/suite/dump/column/vector.expected    2014-07-21 10:50:07 +0900 (3c6beaf)
+++ test/command/suite/dump/column/vector.expected    2014-07-21 11:05:47 +0900 (1136559)
@@ -10,11 +10,6 @@
 }
 {
   "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
-{
-  "inReplyTo": "request-id",
   "statusCode": 200,
   "type": "dump.result",
   "body": true
@@ -43,30 +38,6 @@
   "inReplyTo": "request-id",
   "dataset": "Default",
   "body": {
-    "type": "Hash",
-    "name": "Memos",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
-    "table": "Memos",
-    "name": "tags",
-    "type": "Vector",
-    "valueType": "ShortText",
-    "vectorOptions": {
-      "weight": true
-    }
-  },
-  "type": "dump.column"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
     "table": "Memos",
     "name": "tags",
     "type": "Vector",
@@ -101,8 +72,3 @@
   "dataset": "Default",
   "type": "dump.end"
 }
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}

  Modified: test/command/suite/dump/record/vector/reference.expected (+0 -69)
===================================================================
--- test/command/suite/dump/record/vector/reference.expected    2014-07-21 10:50:07 +0900 (f6036ef)
+++ test/command/suite/dump/record/vector/reference.expected    2014-07-21 11:05:47 +0900 (c6fd8ef)
@@ -10,11 +10,6 @@
 }
 {
   "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
-{
-  "inReplyTo": "request-id",
   "statusCode": 200,
   "type": "dump.result",
   "body": true
@@ -43,16 +38,6 @@
   "inReplyTo": "request-id",
   "dataset": "Default",
   "body": {
-    "type": "Hash",
-    "name": "Memos",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
     "type": "PatriciaTrie",
     "name": "Tags",
     "keyType": "ShortText"
@@ -73,26 +58,6 @@
   "inReplyTo": "request-id",
   "dataset": "Default",
   "body": {
-    "type": "PatriciaTrie",
-    "name": "Tags",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
-    "type": "Hash",
-    "name": "Users",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
     "type": "Hash",
     "name": "Users",
     "keyType": "ShortText"
@@ -142,35 +107,6 @@
   "dataset": "Default",
   "body": {
     "table": "Memos",
-    "name": "tags",
-    "type": "Vector",
-    "valueType": "Tags",
-    "vectorOptions": {
-      "weight": false
-    }
-  },
-  "type": "dump.column"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
-    "table": "Memos",
-    "key": "Groonga newbie",
-    "values": {
-      "tags": [
-        "Groonga",
-        "column store"
-      ]
-    }
-  },
-  "type": "dump.record"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
-    "table": "Memos",
     "key": "Groonga newbie",
     "values": {
       "tags": [
@@ -206,8 +142,3 @@
   "dataset": "Default",
   "type": "dump.end"
 }
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}

  Modified: test/command/suite/dump/table/array.expected (+0 -19)
===================================================================
--- test/command/suite/dump/table/array.expected    2014-07-21 10:50:07 +0900 (36627e0)
+++ test/command/suite/dump/table/array.expected    2014-07-21 11:05:47 +0900 (33695d8)
@@ -10,11 +10,6 @@
 }
 {
   "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
-{
-  "inReplyTo": "request-id",
   "statusCode": 200,
   "type": "dump.result",
   "body": true
@@ -40,20 +35,6 @@
 {
   "inReplyTo": "request-id",
   "dataset": "Default",
-  "body": {
-    "type": "Array",
-    "name": "Logs"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
   "type": "dump.end"
 }
 {

  Modified: test/command/suite/dump/table/double_array_trie.expected (+0 -20)
===================================================================
--- test/command/suite/dump/table/double_array_trie.expected    2014-07-21 10:50:07 +0900 (7b39c25)
+++ test/command/suite/dump/table/double_array_trie.expected    2014-07-21 11:05:47 +0900 (7d965ec)
@@ -10,11 +10,6 @@
 }
 {
   "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
-{
-  "inReplyTo": "request-id",
   "statusCode": 200,
   "type": "dump.result",
   "body": true
@@ -42,21 +37,6 @@
 {
   "inReplyTo": "request-id",
   "dataset": "Default",
-  "body": {
-    "type": "DoubleArrayTrie",
-    "name": "Memos",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
   "type": "dump.end"
 }
 {

  Modified: test/command/suite/dump/table/hash.expected (+0 -20)
===================================================================
--- test/command/suite/dump/table/hash.expected    2014-07-21 10:50:07 +0900 (3612411)
+++ test/command/suite/dump/table/hash.expected    2014-07-21 11:05:47 +0900 (dd206f6)
@@ -10,11 +10,6 @@
 }
 {
   "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
-{
-  "inReplyTo": "request-id",
   "statusCode": 200,
   "type": "dump.result",
   "body": true
@@ -42,21 +37,6 @@
 {
   "inReplyTo": "request-id",
   "dataset": "Default",
-  "body": {
-    "type": "Hash",
-    "name": "Memos",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
   "type": "dump.end"
 }
 {

  Modified: test/command/suite/dump/table/patricia_trie.expected (+0 -20)
===================================================================
--- test/command/suite/dump/table/patricia_trie.expected    2014-07-21 10:50:07 +0900 (fe71a19)
+++ test/command/suite/dump/table/patricia_trie.expected    2014-07-21 11:05:47 +0900 (423e0f6)
@@ -10,11 +10,6 @@
 }
 {
   "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
-{
-  "inReplyTo": "request-id",
   "statusCode": 200,
   "type": "dump.result",
   "body": true
@@ -42,21 +37,6 @@
 {
   "inReplyTo": "request-id",
   "dataset": "Default",
-  "body": {
-    "type": "PatriciaTrie",
-    "name": "Memos",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
   "type": "dump.end"
 }
 {

  Modified: test/command/suite/search/condition/query/nonexistent_column.expected (+0 -11)
===================================================================
--- test/command/suite/search/condition/query/nonexistent_column.expected    2014-07-21 10:50:07 +0900 (36079a8)
+++ test/command/suite/search/condition/query/nonexistent_column.expected    2014-07-21 11:05:47 +0900 (94a25e5)
@@ -32,17 +32,6 @@
           "input": "nonexistent:Droonga"
         }
       }
-    },
-    "sources2": {
-      "statusCode": 400,
-      "body": {
-        "name": "SyntaxError",
-        "message": "Syntax error: syntax:<query> input:<nonexistent:Droonga>",
-        "detail": {
-          "syntax": "query",
-          "input": "nonexistent:Droonga"
-        }
-      }
     }
   }
 }

  Modified: test/command/suite/search/condition/query/syntax_error.expected (+0 -11)
===================================================================
--- test/command/suite/search/condition/query/syntax_error.expected    2014-07-21 10:50:07 +0900 (bb19507)
+++ test/command/suite/search/condition/query/syntax_error.expected    2014-07-21 11:05:47 +0900 (fba56b2)
@@ -32,17 +32,6 @@
           "input": "("
         }
       }
-    },
-    "sources2": {
-      "statusCode": 400,
-      "body": {
-        "name": "SyntaxError",
-        "message": "Syntax error: syntax:<query> input:<(>",
-        "detail": {
-          "syntax": "query",
-          "input": "("
-        }
-      }
     }
   }
 }

  Modified: test/command/suite/search/error/unknown-source.expected (+0 -12)
===================================================================
--- test/command/suite/search/error/unknown-source.expected    2014-07-21 10:50:07 +0900 (e7d4f5a)
+++ test/command/suite/search/error/unknown-source.expected    2014-07-21 11:05:47 +0900 (d67e85a)
@@ -35,18 +35,6 @@
           }
         }
       }
-    },
-    "sources2": {
-      "statusCode": 404,
-      "body": {
-        "name": "UnknownSource",
-        "message": "Source not found: <unknown> It must be a name of an existing table or another query.",
-        "detail": {
-          "unknown-source": {
-            "source": "unknown"
-          }
-        }
-      }
     }
   }
 }

  Modified: test/command/suite/search/output/attributes/invalid.expected (+0 -10)
===================================================================
--- test/command/suite/search/output/attributes/invalid.expected    2014-07-21 10:50:07 +0900 (d974d81)
+++ test/command/suite/search/output/attributes/invalid.expected    2014-07-21 11:05:47 +0900 (8302c11)
@@ -29,16 +29,6 @@
           "attribute": ","
         }
       }
-    },
-    "sources2": {
-      "statusCode": 400,
-      "body": {
-        "name": "InvalidAttribute",
-        "message": "Invalid attribute: <,>",
-        "detail": {
-          "attribute": ","
-        }
-      }
     }
   }
 }

  Added: test/command/suite/watch/subscribe.catalog.json (+23 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/watch/subscribe.catalog.json    2014-07-21 11:05:47 +0900 (7d7d2be)
@@ -0,0 +1,23 @@
+{
+  "datasets": {
+    "Watch": {
+      "nWorkers": 2,
+      "plugins": ["groonga", "watch", "search", "crud"],
+      "replicas": [
+        {
+          "dimension": "_key",
+          "slicer": "hash",
+          "slices": [
+            {
+              "label": "slice100",
+              "weight": 50,
+              "volume": {
+                "address": "127.0.0.1:23003/droonga.watch"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

  Modified: test/command/suite/watch/subscribe.test (+2 -0)
===================================================================
--- test/command/suite/watch/subscribe.test    2014-07-21 10:50:07 +0900 (6f07471)
+++ test/command/suite/watch/subscribe.test    2014-07-21 11:05:47 +0900 (fcfe3d2)
@@ -1,3 +1,5 @@
+# -*- js -*-
+#@require-catalog-version 2
 {
   "type": "watch.subscribe",
   "dataset": "Watch",

  Added: test/command/suite/watch/unsubscribe.catalog.json (+23 -0) 100644
===================================================================
--- /dev/null
+++ test/command/suite/watch/unsubscribe.catalog.json    2014-07-21 11:05:47 +0900 (7d7d2be)
@@ -0,0 +1,23 @@
+{
+  "datasets": {
+    "Watch": {
+      "nWorkers": 2,
+      "plugins": ["groonga", "watch", "search", "crud"],
+      "replicas": [
+        {
+          "dimension": "_key",
+          "slicer": "hash",
+          "slices": [
+            {
+              "label": "slice100",
+              "weight": 50,
+              "volume": {
+                "address": "127.0.0.1:23003/droonga.watch"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

  Modified: test/command/suite/watch/unsubscribe.test (+2 -0)
===================================================================
--- test/command/suite/watch/unsubscribe.test    2014-07-21 10:50:07 +0900 (7a005de)
+++ test/command/suite/watch/unsubscribe.test    2014-07-21 11:05:47 +0900 (d3086c0)
@@ -1,3 +1,5 @@
+# -*- js -*-
+#@require-catalog-version 2
 {
   "type": "watch.unsubscribe",
   "dataset": "Watch",
-------------- next part --------------
HTML����������������������������...
Download 

• Previous message: [Groonga-commit] droonga/droonga-engine at 7bc0382 [master] dump: add TODO
• Next message: [Groonga-commit] Still Failing: droonga/droonga-engine#462 (master - 7bc0382)
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]