droonga-engine 1.0.2 → 1.0.3

data/test/command/suite/search/response/records/value/time.expected

@@ -5,6 +5,18 @@
   "body": {
     "result": {
       "count": 2,
+      "attributes": [
+        {
+          "name": "_key",
+          "type": "ShortText",
+          "vector": false
+        },
+        {
+          "name": "start",
+          "type": "Time",
+          "vector": false
+        }
+      ],
       "records": [
         [
           "Groonga Night 3",

data/test/command/suite/search/response/records/value/time.test

@@ -1,7 +1,7 @@
 #@include fixture/event.jsons
 {
   "type": "search",
-  "dataset": "Droonga",
+  "dataset": "Default",
   "body": {
     "queries": {
       "result": {

data/test/command/suite/search/simple.expected

@@ -5,6 +5,18 @@
   "body": {
     "result": {
       "count": 9,
+      "attributes": [
+        {
+          "name": "_key",
+          "type": "ShortText",
+          "vector": false
+        },
+        {
+          "name": "title",
+          "type": "ShortText",
+          "vector": false
+        }
+      ],
       "records": [
         [
           "1.1",

data/test/command/suite/search/simple.test

@@ -1,7 +1,7 @@
 #@include fixture/documents.jsons
 {
   "type": "search",
-  "dataset": "Droonga",
+  "dataset": "Default",
   "body": {
     "queries": {
       "result": {

data/test/command/suite/search/sort/default-offset-limit.expected

@@ -5,6 +5,13 @@
   "body": {
     "result": {
       "count": 9,
+      "attributes": [
+        {
+          "name": "_key",
+          "type": "ShortText",
+          "vector": false
+        }
+      ],
       "records": [
         [
           "1.9"

data/test/command/suite/search/sort/default-offset-limit.test

@@ -1,7 +1,7 @@
 #@include fixture/documents.jsons
 {
   "type": "search",
-  "dataset": "Droonga",
+  "dataset": "Default",
   "body": {
     "queries": {
       "result": {

data/test/command/suite/search/sort/invisible-column.expected

@@ -5,6 +5,13 @@
   "body": {
     "result": {
       "count": 9,
+      "attributes": [
+        {
+          "name": "title",
+          "type": "ShortText",
+          "vector": false
+        }
+      ],
       "records": [
         [
           "Groonga library"

data/test/command/suite/search/sort/invisible-column.test

@@ -1,7 +1,7 @@
 #@include fixture/documents.jsons
 {
   "type": "search",
-  "dataset": "Droonga",
+  "dataset": "Default",
   "body": {
     "queries": {
       "result": {

data/test/unit/catalog/test_collection_volume.rb

@@ -100,4 +100,20 @@ class CatalogSingleVolumeTest < Test::Unit::TestCase
       end
     end
   end
+
+  class NodesTest < self
+    def test_all_nodes
+      data = {
+        "slices" => [
+          { "volume" => { "address" => "127.0.0.1:23003/droonga.000" } },
+          { "volume" => { "address" => "127.0.0.1:23003/droonga.001" } },
+          { "volume" => { "address" => "127.0.0.1:23004/droonga.100" } },
+          { "volume" => { "address" => "127.0.0.1:23004/droonga.101" } },
+        ],
+      }
+      volume = create_collection_volume(data)
+      assert_equal(["127.0.0.1:23003/droonga", "127.0.0.1:23004/droonga"],
+                   volume.all_nodes)
+    end
+  end
 end

data/test/unit/catalog/test_dataset.rb

@@ -101,4 +101,40 @@ class CatalogDatasetTest < Test::Unit::TestCase
                    dataset.replicas)
     end
   end
+
+  class NodesTest < self
+    def test_all_nodes
+      data = {
+        "replicas" => [
+          {
+            "dimension" =>"_key",
+            "slicer" =>"hash",
+            "slices" =>[
+              { "volume" =>{ "address" =>"127.0.0.1:23003/droonga.000" } },
+              { "volume" =>{ "address" =>"127.0.0.1:23004/droonga.001" } },
+              { "volume" =>{ "address" =>"127.0.0.1:23003/droonga.002" } },
+              { "volume" =>{ "address" =>"127.0.0.1:23005/droonga.003" } },
+            ],
+          },
+          {
+            "dimension" =>"_key",
+            "slicer" =>"hash",
+            "slices" =>[
+              { "volume" =>{ "address" =>"127.0.0.1:23004/droonga.000" } },
+              { "volume" =>{ "address" =>"127.0.0.1:23005/droonga.001" } },
+              { "volume" =>{ "address" =>"127.0.0.1:23003/droonga.002" } },
+              { "volume" =>{ "address" =>"127.0.0.1:23004/droonga.003" } },
+            ],
+          },
+        ],
+      }
+      dataset = create_dataset(data)
+      assert_equal([
+                     "127.0.0.1:23003/droonga",
+                     "127.0.0.1:23004/droonga",
+                     "127.0.0.1:23005/droonga",
+                   ],
+                   dataset.all_nodes)
+    end
+  end
 end

data/test/unit/catalog/test_single_volume.rb

@@ -28,4 +28,13 @@ class CatalogSingleVolumeTest < Test::Unit::TestCase
     assert_equal("127.0.0.1:10047/volume.000",
                  volume.address)
   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)
+  end
 end

data/test/unit/catalog/test_slice.rb

@@ -88,5 +88,16 @@ class CatalogSliceTest < Test::Unit::TestCase
       assert_equal("127.0.0.1:10047/volume.000",
                    slice.volume.address)
     end
+
+    def test_all_nodes
+      data = {
+        "volume" => {
+          "address" => "127.0.0.1:10047/volume.000",
+        },
+      }
+      slice = create_slice(data)
+      assert_equal(["127.0.0.1:10047/volume"],
+                   slice.all_nodes)
+    end
   end
 end

data/test/unit/catalog/test_version1.rb

@@ -51,24 +51,12 @@ class CatalogVersion1Test < Test::Unit::TestCase
                        :plugins   => ["for_dataset"],
                        :n_workers => 0
                      },
-                     "localhost:23003/test.001" => {
-                       :database  => "#{base_path}/001/db",
-                       :dataset   => "Test",
-                       :plugins   => ["for_dataset"],
-                       :n_workers => 0
-                     },
                      "localhost:23003/test.002" => {
                        :database  => "#{base_path}/002/db",
                        :dataset   => "Test",
                        :plugins   => ["for_dataset"],
                        :n_workers => 0
                      },
-                     "localhost:23003/test.003" => {
-                       :database  => "#{base_path}/003/db",
-                       :dataset   => "Test",
-                       :plugins   => ["for_dataset"],
-                       :n_workers => 0
-                     },
                    },
                    partitions)
     end
@@ -135,6 +123,13 @@ class CatalogVersion1Test < Test::Unit::TestCase
 
       end
     end
+
+    class NodesTest < self
+      def test_all_nodes
+        assert_equal(["localhost:23003/test", "localhost:23004/test"],
+                     @catalog.all_nodes)
+      end
+    end
   end
 
   class DataSetTest < self

data/test/unit/catalog/test_version2.rb

@@ -120,5 +120,12 @@ class CatalogVersion2Test < Test::Unit::TestCase
 
       end
     end
+
+    class NodesTest < self
+      def test_all_nodes
+        assert_equal(["localhost:23003/test", "localhost:23004/test"],
+                     @catalog.all_nodes)
+      end
+    end
   end
 end

data/test/unit/catalog/test_volume_collection.rb

@@ -47,4 +47,32 @@ class CatalogVolumeCollectionTest < Test::Unit::TestCase
                    @collection.select(:all))
     end
   end
+
+  class NodesTest < self
+    def create_volume_collection(volumes)
+      volumes = volumes.collect do |volume|
+        create_single_volume(volume)
+      end
+      super(volumes)
+    end
+
+    def create_single_volume(data)
+      Droonga::Catalog::SingleVolume.new(data)
+    end
+
+    def setup
+      volumes = [
+        { "address" => "volume1:10047/droonga.000" },
+        { "address" => "volume1:10047/droonga.001" },
+        { "address" => "volume2:10047/droonga.002" },
+        { "address" => "volume2:10047/droonga.003" },
+      ]
+      @collection = create_volume_collection(volumes)
+    end
+
+    def test_all_nodes
+      assert_equal(["volume1:10047/droonga", "volume2:10047/droonga"],
+                   @collection.all_nodes)
+    end
+  end
 end

data/test/unit/fixtures/catalog/version1.json

@@ -1,10 +1,17 @@
 {
   "effective_date": "2013-09-01T00:00:00Z",
-  "zones": ["localhost:23003/test"],
+  "zones": [
+    "localhost:23003/test",
+    "localhost:23004/test"
+  ],
   "farms": {
     "localhost:23003/test": {
       "device": ".",
       "capacity": 10
+    },
+    "localhost:23004/test": {
+      "device": ".",
+      "capacity": 10
     }
   },
   "datasets": {
@@ -21,7 +28,7 @@
           "partitions": {
             "2013-09-01": [
               "localhost:23003/test.000",
-              "localhost:23003/test.001"
+              "localhost:23004/test.001"
             ]
           }
         },
@@ -30,7 +37,7 @@
           "partitions": {
             "2013-09-01": [
               "localhost:23003/test.002",
-              "localhost:23003/test.003"
+              "localhost:23004/test.003"
             ]
           }
         }

data/test/unit/fixtures/catalog/version2.json

@@ -32,7 +32,7 @@
                 "address": "localhost:23003/test.002"
               }
             }
-	  ]
+          ]
         },
         {
           "slices": [
@@ -54,7 +54,7 @@
                 "address": "localhost:23004/test.012"
               }
             }
-	  ]
+          ]
         }
       ]
     }

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

@@ -127,11 +127,9 @@ class GroongaSelectAdapterOutputTest < Test::Unit::TestCase
           [
             [3],
             headers,
-            [
-              [1, "a1", 10],
-              [2, "a2", 20],
-              [3, "a3", 30],
-            ],
+            [1, "a1", 10],
+            [2, "a2", 20],
+            [3, "a3", 30],
           ],
         ],
       ]
@@ -178,19 +176,15 @@ class GroongaSelectAdapterOutputTest < Test::Unit::TestCase
           [
             [3],
             headers,
-            [
-              ["a1", 10],
-              ["a2", 20],
-              ["a3", 30],
-            ],
+            ["a1", 10],
+            ["a2", 20],
+            ["a3", 30],
           ],
           [
             [2],
             headers,
-            [
-              ["b1", 10],
-              ["b2", 20],
-            ],
+            ["b1", 10],
+            ["b2", 20],
           ],
         ],
       ]

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

@@ -57,7 +57,7 @@ class ColumnCreateTest < GroongaHandlerTest
     process(:column_create,
             {"table" => "Books", "name" => "title", "type" => "ShortText"})
     assert_equal(<<-SCHEMA, dump)
-table_create Books TABLE_HASH_KEY --key_type ShortText
+table_create Books TABLE_HASH_KEY ShortText
 column_create Books title COLUMN_SCALAR ShortText
     SCHEMA
   end
@@ -69,7 +69,7 @@ column_create Books title COLUMN_SCALAR ShortText
     process(:column_create,
             {"table" => "Books", "name" => "main_text", "type" => "LongText"})
     assert_equal(<<-SCHEMA, dump)
-table_create Books TABLE_HASH_KEY --key_type ShortText
+table_create Books TABLE_HASH_KEY ShortText
 column_create Books main_text COLUMN_SCALAR LongText
     SCHEMA
   end
@@ -99,7 +99,7 @@ column_create Books main_text COLUMN_SCALAR LongText
         end
         process(:column_create, request)
         assert_equal(<<-EXPECTED, dump)
-table_create Books TABLE_HASH_KEY --key_type ShortText
+table_create Books TABLE_HASH_KEY ShortText
 column_create Books title #{data[:flags]} ShortText
         EXPECTED
       end
@@ -128,7 +128,7 @@ column_create Books title #{data[:flags]} ShortText
         }
         process(:column_create, request)
         assert_equal(<<-EXPECTED, dump)
-table_create Books TABLE_HASH_KEY --key_type ShortText
+table_create Books TABLE_HASH_KEY ShortText
 column_create Books title COLUMN_SCALAR ShortText
 
 column_create Books entry_title #{data[:flags]} Books title
@@ -160,7 +160,7 @@ column_create Books entry_title #{data[:flags]} Books title
         }
         process(:column_create, request)
         assert_equal(<<-EXPECTED, dump)
-table_create Books TABLE_HASH_KEY --key_type ShortText
+table_create Books TABLE_HASH_KEY ShortText
 column_create Books title COLUMN_SCALAR ShortText
 
 column_create Books entry_title #{flags} Books title

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

@@ -77,7 +77,7 @@ class ColumnRemoveTest < GroongaHandlerTest
     process(:column_remove,
             {"table" => "Books", "name" => "title"})
     assert_equal(<<-SCHEMA, dump)
-table_create Books TABLE_HASH_KEY --key_type ShortText
+table_create Books TABLE_HASH_KEY ShortText
     SCHEMA
   end
 
@@ -92,7 +92,7 @@ table_create Books TABLE_HASH_KEY --key_type ShortText
     process(:column_remove,
             {"table" => "Books", "name" => "title"})
     assert_equal(<<-SCHEMA, dump)
-table_create Books TABLE_HASH_KEY --key_type ShortText
+table_create Books TABLE_HASH_KEY ShortText
     SCHEMA
   end
 end