droonga-engine 1.0.4 → 1.0.5

data/test/command/suite/dump/table/patricia_trie.expected

@@ -8,11 +8,6 @@
   "dataset": "Default",
   "type": "dump.start"
 }
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.start"
-}
 {
   "inReplyTo": "request-id",
   "statusCode": 200,
@@ -29,11 +24,6 @@
   },
   "type": "dump.table"
 }
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "type": "dump.end"
-}
 {
   "inReplyTo": "request-id",
   "dataset": "Default",
@@ -49,16 +39,6 @@
   "dataset": "Default",
   "type": "dump.end"
 }
-{
-  "inReplyTo": "request-id",
-  "dataset": "Default",
-  "body": {
-    "type": "PatriciaTrie",
-    "name": "Memos",
-    "keyType": "ShortText"
-  },
-  "type": "dump.table"
-}
 {
   "inReplyTo": "request-id",
   "dataset": "Default",

data/test/command/suite/search/condition/query/nonexistent_column.expected

@@ -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"
-        }
-      }
     }
   }
 }

data/test/command/suite/search/condition/query/syntax_error.expected

@@ -32,17 +32,6 @@
           "input": "("
         }
       }
-    },
-    "sources2": {
-      "statusCode": 400,
-      "body": {
-        "name": "SyntaxError",
-        "message": "Syntax error: syntax:<query> input:<(>",
-        "detail": {
-          "syntax": "query",
-          "input": "("
-        }
-      }
     }
   }
 }

data/test/command/suite/search/error/unknown-source.expected

@@ -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"
-          }
-        }
-      }
     }
   }
 }

data/test/command/suite/search/output/attributes/invalid.expected

@@ -29,16 +29,6 @@
           "attribute": ","
         }
       }
-    },
-    "sources2": {
-      "statusCode": 400,
-      "body": {
-        "name": "InvalidAttribute",
-        "message": "Invalid attribute: <,>",
-        "detail": {
-          "attribute": ","
-        }
-      }
     }
   }
 }

data/test/command/suite/search/output/attributes/reference_vector.catalog.json

@@ -0,0 +1,27 @@
+{
+  "datasets": {
+    "Default": {
+      "fact": "Memos",
+      "schema": {
+        "Tags": {
+          "type": "PatriciaTrie",
+          "keyType": "ShortText"
+        },
+        "Memos": {
+          "type": "Hash",
+          "keyType": "ShortText",
+          "columns": {
+            "content": {
+              "type": "Scalar",
+              "valueType": "Text"
+            },
+            "tags": {
+              "type": "Vector",
+              "valueType": "Tags"
+            }
+          }
+        }
+      }
+    }
+  }
+}

data/test/command/suite/search/output/attributes/reference_vector.expected

@@ -0,0 +1,30 @@
+{
+  "inReplyTo": "request-id",
+  "statusCode": 200,
+  "type": "search.result",
+  "body": {
+    "memos": {
+      "attributes": [
+        {
+          "name": "_key",
+          "type": "ShortText",
+          "vector": false
+        },
+        {
+          "name": "tags",
+          "type": "Tags",
+          "vector": true
+        }
+      ],
+      "records": [
+        [
+          "Droonga is fun",
+          [
+            "Droonga",
+            "Fun"
+          ]
+        ]
+      ]
+    }
+  }
+}

data/test/command/suite/search/output/attributes/reference_vector.test

@@ -0,0 +1,32 @@
+# -*- js -*-
+#@require-catalog-version 2
+#@disable-logging
+{
+  "type": "add",
+  "dataset": "Default",
+  "body": {
+    "table": "Memos",
+    "key": "Droonga is fun",
+    "values": {
+      "content": "I started Droonga. It is very fun!",
+      "tags": ["Droonga", "Fun"]
+    }
+  }
+}
+#@enable-logging
+{
+  "type": "search",
+  "dataset": "Default",
+  "body": {
+    "queries": {
+      "memos": {
+        "source": "Memos",
+        "output": {
+          "elements": ["attributes", "records"],
+          "attributes": ["_key", "tags"],
+          "limit": 10
+        }
+      }
+    }
+  }
+}

data/test/command/suite/watch/subscribe.catalog.json

@@ -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"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

data/test/command/suite/watch/subscribe.test

@@ -1,3 +1,5 @@
+# -*- js -*-
+#@require-catalog-version 2
 {
   "type": "watch.subscribe",
   "dataset": "Watch",

data/test/command/suite/watch/unsubscribe.catalog.json

@@ -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"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  }
+}

data/test/command/suite/watch/unsubscribe.test

@@ -1,3 +1,5 @@
+# -*- js -*-
+#@require-catalog-version 2
 {
   "type": "watch.unsubscribe",
   "dataset": "Watch",

data/test/performance/run-test.rb

@@ -13,7 +13,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "rbconfig"
 require "fileutils"

data/test/unit/catalog/test_collection_volume.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/dataset"
 

data/test/unit/catalog/test_dataset.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/dataset"
 

data/test/unit/catalog/test_schema.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/schema"
 

data/test/unit/catalog/test_single_volume.rb

@@ -11,30 +11,38 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/single_volume"
 
 class CatalogSingleVolumeTest < Test::Unit::TestCase
-  def create_single_volume(data)
-    Droonga::Catalog::SingleVolume.new(data)
-  end
+  class AddressTest < self
+    def setup
+      data = {
+        "address" => "127.0.0.1:10047/tag.000",
+      }
+      @volume = Droonga::Catalog::SingleVolume.new(data)
+    end
 
-  def test_address
-    data = {
-      "address" => "127.0.0.1:10047/volume.000",
-    }
-    volume = create_single_volume(data)
-    assert_equal("127.0.0.1:10047/volume.000",
-                 volume.address)
-  end
+    def address(host, port, tag, name)
+      Droonga::Address.new(:host => host,
+                           :port => port,
+                           :tag  => tag,
+                           :name => name)
+    end
+
+    def test_address
+      assert_equal(address("127.0.0.1", 10047, "tag", "000"),
+                   @volume.address)
+    end
+
+    def test_node
+      assert_equal("127.0.0.1:10047/tag", @volume.node)
+    end
 
-  def test_all_nodes
-    data = {
-      "address" => "127.0.0.1:10047/volume.000",
-    }
-    volume = create_single_volume(data)
-    assert_equal(["127.0.0.1:10047/volume"],
-                 volume.all_nodes)
+    def test_all_nodes
+      assert_equal(["127.0.0.1:10047/tag"],
+                   @volume.all_nodes)
+    end
   end
 end

data/test/unit/catalog/test_slice.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/dataset"
 
@@ -86,7 +86,7 @@ class CatalogSliceTest < Test::Unit::TestCase
       }
       slice = create_slice(data)
       assert_equal("127.0.0.1:10047/volume.000",
-                   slice.volume.address)
+                   slice.volume.address.to_s)
     end
 
     def test_all_nodes

data/test/unit/catalog/test_version1.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/version1"
 

data/test/unit/catalog/test_version2.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/version2"
 

data/test/unit/catalog/test_version2_validator.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/version2_validator"
 

data/test/unit/catalog/test_volume_collection.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/catalog/volume_collection"
 

data/test/unit/helper/distributed_search_planner_helper.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugins/search/distributed_search_planner"
 

data/test/unit/helper/fixture.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Fixture
   def fixture_directory

data/test/unit/helper/plugin_helper.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module PluginHelper
   def setup_plugin(plugin_class)

data/test/unit/helper/sandbox.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module Sandbox
   class << self

data/test/unit/helper/stub_worker.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class StubWorker
   attr_reader :context, :body, :envelope

data/test/unit/helper/watch_helper.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/watch_schema"
 

data/test/unit/helper.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/test"
 

data/test/unit/plugins/crud/test_add.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugins/crud"
 

data/test/unit/plugins/groonga/select/test_adapter_input.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugins/groonga/select"
 

data/test/unit/plugins/groonga/select/test_adapter_output.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 require "droonga/plugins/groonga/select"
 

data/test/unit/plugins/groonga/test_column_create.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ColumnCreateTest < GroongaHandlerTest
   def create_handler

data/test/unit/plugins/groonga/test_column_list.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ColumnListTest < GroongaHandlerTest
   COLUMNS_HEADER = [

data/test/unit/plugins/groonga/test_column_remove.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ColumnRemoveTest < GroongaHandlerTest
   def create_handler

data/test/unit/plugins/groonga/test_column_rename.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class ColumnRenameTest < GroongaHandlerTest
   def create_handler

data/test/unit/plugins/groonga/test_delete.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class DeleteTest < GroongaHandlerTest
   def create_handler

data/test/unit/plugins/groonga/test_table_create.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableCreateTest < GroongaHandlerTest
   def create_handler

data/test/unit/plugins/groonga/test_table_list.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableListTest < GroongaHandlerTest
   TABLES_HEADER = [

data/test/unit/plugins/groonga/test_table_remove.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class TableRemoveTest < GroongaHandlerTest
   def create_handler

data/test/unit/plugins/search/planner/test_basic.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class DistributedSearchPlannerBasicTest < Test::Unit::TestCase
   include DistributedSearchPlannerHelper

data/test/unit/plugins/search/planner/test_group_by.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class DistributedSearchPlannerGroupByTest < Test::Unit::TestCase
   include DistributedSearchPlannerHelper

data/test/unit/plugins/search/planner/test_output.rb

@@ -11,7 +11,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 class DistributedSearchPlannerOutputTest < Test::Unit::TestCase
   include DistributedSearchPlannerHelper