RubyGems - rroonga - Versions diffs - 6.0.9-x86-mingw32 → 6.1.0-x86-mingw32 - Mend

rroonga 6.0.9-x86-mingw32 → 6.1.0-x86-mingw32

Files changed (688) hide show

data/vendor/local/share/doc/groonga/ja/html/tutorial/patricia_trie.html CHANGED Viewed

@@ -7,7 +7,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>4.8. パトリシア木による前方一致検索 &mdash; Groonga v6.0.9ドキュメント</title>
+    <title>4.8. パトリシア木による前方一致検索 &#8212; Groonga v6.1.0ドキュメント</title>
     <link rel="stylesheet" href="../_static/groonga.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '6.0.9',
+        VERSION:     '6.1.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -26,7 +26,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/translations.js"></script>
     <link rel="shortcut icon" href="../_static/favicon.ico"/>
-    <link rel="top" title="Groonga v6.0.9ドキュメント" href="../index.html" />
+    <link rel="index" title="索引" href="../genindex.html" />
+    <link rel="search" title="検索" href="../search.html" />
+    <link rel="top" title="Groonga v6.1.0ドキュメント" href="../index.html" />
     <link rel="up" title="4. チュートリアル" href="../tutorial.html" />
     <link rel="next" title="4.9. 全文検索用の語彙表の作成" href="lexicon.html" />
     <link rel="prev" title="4.7. match_columnsパラメータ" href="match_columns.html" />
@@ -61,8 +63,8 @@
         <li class="right" >
           <a href="match_columns.html" title="4.7. match_columnsパラメータ"
              accesskey="P">前へ</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.0.9ドキュメント</a> &raquo;</li>
-          <li class="nav-item nav-item-1"><a href="../tutorial.html" accesskey="U">4. チュートリアル</a> &raquo;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.1.0ドキュメント</a> &#187;</li>
+          <li class="nav-item nav-item-1"><a href="../tutorial.html" accesskey="U">4. チュートリアル</a> &#187;</li>
       </ul>
     </div>
@@ -292,12 +294,12 @@ select --table PatSuffix --filter &#39;_key @$ &quot;ゆき&quot; &amp;&amp; ori
         <li class="right" >
           <a href="match_columns.html" title="4.7. match_columnsパラメータ"
              >前へ</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.0.9ドキュメント</a> &raquo;</li>
-          <li class="nav-item nav-item-1"><a href="../tutorial.html" >4. チュートリアル</a> &raquo;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.1.0ドキュメント</a> &#187;</li>
+          <li class="nav-item nav-item-1"><a href="../tutorial.html" >4. チュートリアル</a> &#187;</li>
       </ul>
     </div>
     <div class="footer" role="contentinfo">
-        &copy; Copyright 2009-2016, Brazil, Inc.
+        &#169; Copyright 2009-2016, Brazil, Inc.
     </div>
   </body>
 </html>

data/vendor/local/share/doc/groonga/ja/html/tutorial/query_expansion.html CHANGED Viewed

@@ -7,7 +7,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>4.11. クエリ拡張 &mdash; Groonga v6.0.9ドキュメント</title>
+    <title>4.11. クエリ拡張 &#8212; Groonga v6.1.0ドキュメント</title>
     <link rel="stylesheet" href="../_static/groonga.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '6.0.9',
+        VERSION:     '6.1.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -26,7 +26,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/translations.js"></script>
     <link rel="shortcut icon" href="../_static/favicon.ico"/>
-    <link rel="top" title="Groonga v6.0.9ドキュメント" href="../index.html" />
+    <link rel="index" title="索引" href="../genindex.html" />
+    <link rel="search" title="検索" href="../search.html" />
+    <link rel="top" title="Groonga v6.1.0ドキュメント" href="../index.html" />
     <link rel="up" title="4. チュートリアル" href="../tutorial.html" />
     <link rel="next" title="5. サーバー" href="../server.html" />
     <link rel="prev" title="4.10. マイクロブログ検索システムの作成" href="micro_blog.html" />
@@ -61,8 +63,8 @@
         <li class="right" >
           <a href="micro_blog.html" title="4.10. マイクロブログ検索システムの作成"
              accesskey="P">前へ</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.0.9ドキュメント</a> &raquo;</li>
-          <li class="nav-item nav-item-1"><a href="../tutorial.html" accesskey="U">4. チュートリアル</a> &raquo;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.1.0ドキュメント</a> &#187;</li>
+          <li class="nav-item nav-item-1"><a href="../tutorial.html" accesskey="U">4. チュートリアル</a> &#187;</li>
       </ul>
     </div>
@@ -323,12 +325,12 @@ select Doc --match_columns body --query &quot;theatre&quot; --query_expander Syn
         <li class="right" >
           <a href="micro_blog.html" title="4.10. マイクロブログ検索システムの作成"
              >前へ</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.0.9ドキュメント</a> &raquo;</li>
-          <li class="nav-item nav-item-1"><a href="../tutorial.html" >4. チュートリアル</a> &raquo;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.1.0ドキュメント</a> &#187;</li>
+          <li class="nav-item nav-item-1"><a href="../tutorial.html" >4. チュートリアル</a> &#187;</li>
       </ul>
     </div>
     <div class="footer" role="contentinfo">
-        &copy; Copyright 2009-2016, Brazil, Inc.
+        &#169; Copyright 2009-2016, Brazil, Inc.
     </div>
   </body>
 </html>

data/vendor/local/share/doc/groonga/ja/html/tutorial/search.html CHANGED Viewed

@@ -7,7 +7,7 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>4.4. さまざまな検索条件 &mdash; Groonga v6.0.9ドキュメント</title>
+    <title>4.4. さまざまな検索条件 &#8212; Groonga v6.1.0ドキュメント</title>
     <link rel="stylesheet" href="../_static/groonga.css" type="text/css" />
     <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
@@ -15,7 +15,7 @@
     <script type="text/javascript">
       var DOCUMENTATION_OPTIONS = {
         URL_ROOT:    '../',
-        VERSION:     '6.0.9',
+        VERSION:     '6.1.0',
         COLLAPSE_INDEX: false,
         FILE_SUFFIX: '.html',
         HAS_SOURCE:  true
@@ -26,7 +26,9 @@
     <script type="text/javascript" src="../_static/doctools.js"></script>
     <script type="text/javascript" src="../_static/translations.js"></script>
     <link rel="shortcut icon" href="../_static/favicon.ico"/>
-    <link rel="top" title="Groonga v6.0.9ドキュメント" href="../index.html" />
+    <link rel="index" title="索引" href="../genindex.html" />
+    <link rel="search" title="検索" href="../search.html" />
+    <link rel="top" title="Groonga v6.1.0ドキュメント" href="../index.html" />
     <link rel="up" title="4. チュートリアル" href="../tutorial.html" />
     <link rel="next" title="4.5. ドリルダウン" href="drilldown.html" />
     <link rel="prev" title="4.3. いろいろなデータの保存" href="data.html" />
@@ -61,8 +63,8 @@
         <li class="right" >
           <a href="data.html" title="4.3. いろいろなデータの保存"
              accesskey="P">前へ</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.0.9ドキュメント</a> &raquo;</li>
-          <li class="nav-item nav-item-1"><a href="../tutorial.html" accesskey="U">4. チュートリアル</a> &raquo;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.1.0ドキュメント</a> &#187;</li>
+          <li class="nav-item nav-item-1"><a href="../tutorial.html" accesskey="U">4. チュートリアル</a> &#187;</li>
       </ul>
     </div>
@@ -613,12 +615,12 @@ select --table Site --query &quot;_id:1 OR _id:2&quot; --output_columns _key,loc
         <li class="right" >
           <a href="data.html" title="4.3. いろいろなデータの保存"
              >前へ</a> |</li>
-        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.0.9ドキュメント</a> &raquo;</li>
-          <li class="nav-item nav-item-1"><a href="../tutorial.html" >4. チュートリアル</a> &raquo;</li>
+        <li class="nav-item nav-item-0"><a href="../index.html">Groonga v6.1.0ドキュメント</a> &#187;</li>
+          <li class="nav-item nav-item-1"><a href="../tutorial.html" >4. チュートリアル</a> &#187;</li>
       </ul>
     </div>
     <div class="footer" role="contentinfo">
-        &copy; Copyright 2009-2016, Brazil, Inc.
+        &#169; Copyright 2009-2016, Brazil, Inc.
     </div>
   </body>
 </html>

data/vendor/local/share/groonga/html/admin/index.html CHANGED Viewed

@@ -9,7 +9,7 @@
     <link rel="icon" href="favicon.png">
     <!-- Place apple-touch-icon.png in the root directory -->
     <link rel="stylesheet" href="styles/vendor.7f75f6e0.css">
-    <link rel="stylesheet" href="styles/main.d9de008c.css">
+    <link rel="stylesheet" href="styles/main.db676f1c.css">
   </head>
   <body ng-app="groongaAdminApp">
     <!--[if lt IE 7]>
@@ -36,8 +36,8 @@
     <script src="scripts/oldieshim.572be7b4.js"></script>
     <![endif]-->
-    <script src="scripts/vendor.2c228d46.js"></script>
+    <script src="scripts/vendor.6c1a277a.js"></script>
-        <script src="scripts/scripts.a1c295fa.js"></script>
+        <script src="scripts/scripts.d3e19381.js"></script>
 </body>
 </html>

data/vendor/local/share/groonga/html/admin/scripts/{scripts.a1c295fa.js → scripts.d3e19381.js} RENAMED Viewed

@@ -30,6 +30,22 @@
     this._parameters = parameters;
   };
+  GroongaClient.Request.prototype.then = function(successCallback, errorCallback) {
+    var name = this._name;
+    return this._rawRequest.then(
+      function(rawResponse) {
+        var ResponseConstructor = GroongaClient.Response.find(name);
+        var response = new ResponseConstructor(rawResponse.data);
+        return successCallback(response, rawResponse);
+      },
+      function(rawResponse) {
+        var ResponseConstructor = GroongaClient.Response.find(name);
+        var response = new ResponseConstructor(rawResponse.data);
+        return errorCallback(response, rawResponse);
+      }
+    );
+  };
   GroongaClient.Request.prototype.success = function(callback) {
     var name = this._name;
     return this._rawRequest.then(function(rawResponse) {
@@ -40,6 +56,7 @@
   };
   GroongaClient.Request.prototype.error = function(callback) {
+    var name = this._name;
     return this._rawRequest.then(null, function(rawResponse) {
       var ResponseConstructor = GroongaClient.Response.find(name);
       var response = new ResponseConstructor(rawResponse.data);
@@ -188,6 +205,14 @@ GroongaClient.Response.find = function(name) {
   Schema.prototype = Object.create(GroongaClient.Response.Base.prototype);
   Schema.prototype.constructor = Schema;
+  Schema.prototype.types = function() {
+    return this.body().types;
+  };
+  Schema.prototype.tables = function() {
+    return this.body().tables;
+  };
 })();
 'use strict';
@@ -384,6 +409,22 @@ GroongaClient.Response.find = function(name) {
 'use strict';
+(function() {
+  function ThreadLimit(rawData) {
+    GroongaClient.Response.Base.call(this, rawData);
+  }
+  GroongaClient.Response.ThreadLimit = ThreadLimit;
+  ThreadLimit.prototype = Object.create(GroongaClient.Response.Base.prototype);
+  ThreadLimit.prototype.constructor = ThreadLimit;
+  ThreadLimit.prototype.lastMaxLimit = function() {
+    return this.body();
+  };
+})();
+'use strict';
 (function(global) {
   function TimeUnit(parameters) {
     this.label = parameters.label;
@@ -603,65 +644,17 @@ angular.module('groongaAdminApp')
       function createSchema() {
         var newSchema = {};
-        fillTypes(newSchema);
         return newSchema;
       }
-      function fillTypes(schema) {
-        var builtinTypes = [
-          {
-            name: 'Bool'
-          },
-          {
-            name: 'Int8'
-          },
-          {
-            name: 'UInt8'
-          },
-          {
-            name: 'Int16'
-          },
-          {
-            name: 'UInt16'
-          },
-          {
-            name: 'Int32'
-          },
-          {
-            name: 'UInt32'
-          },
-          {
-            name: 'Int64'
-          },
-          {
-            name: 'UInt64'
-          },
-          {
-            name: 'Float'
-          },
-          {
-            name: 'Time'
-          },
-          {
-            name: 'ShortText'
-          },
-          {
-            name: 'Text'
-          },
-          {
-            name: 'LongText'
-          },
-          {
-            name: 'TokyoGeoPoint'
-          },
-          {
-            name: 'WGS84GeoPoint'
-          }
-        ];
-        schema.types = {};
-        angular.forEach(builtinTypes, function(type) {
-          schema.types[type.name] = type;
+      function buildTypes(rawTypes) {
+        var types = {};
+        angular.forEach(rawTypes, function(rawType, name) {
+          types[name] = {
+            name: rawType.name
+          };
         });
+        return types;
       }
       function isTextType(typeName) {
@@ -675,120 +668,189 @@ angular.module('groongaAdminApp')
         }
       }
-      function isReferenceType(schema, typeName) {
-        return typeName in schema.tables;
-      }
+      function buildTable(rawTypes, rawTable) {
+        var table = {};
+        table.id           = 0; // XXX it exists in a table_list response but missing in a schema response.
+        table.name         = rawTable.name;
+        table.path         = ''; // XXX it exists in a table_list response but missing in a schema response.
+        table.valueType    = rawTable.value_type && rawTable.value_type.name;
+        table.tokenizer    = rawTable.tokenizer && rawTable.tokenizer.name;
+        table.normalizer   = rawTable.normalizer && rawTable.normalizer.name;
+        table.type         = rawTable.type;
+        table.flags = rawTable.command.arguments.flags.split('|');
+        table.tokenFilters = rawTable.token_filters.join(',');
+        table.keyType = null;
+        if (rawTable.key_type) {
+          table.keyType = {
+            name: rawTable.key_type.name,
+            isTextType: isTextType(rawTable.key_type.name)
+          };
+        }
-      function resolveTable(table) {
-        table.keyType = {
-          name: table.domain,
-          isTextType: isTextType(table.domain)
-        };
-      }
+        table.isArray           = table.type === 'array';
+        table.isHashTable       = table.type === 'hash table';
+        table.isPatriciaTrie    = table.type === 'patricia trie';
+        table.isDoubleArrayTrie = table.type === 'double attay trie';
+        table.hasKey            = !table.isArray;
-      function resolveTables(schema) {
-        angular.forEach(schema.tables, function(table) {
-          resolveTable(table);
-        });
+        table.range  = table.valueType; // for backward compatibility
+        table.domain = table.keyType && table.keyType.name; // for backward compatibility
+        table.columns = buildColumns(rawTypes, rawTable);
+        return table;
       }
-      function resolveColumn(schema, column) {
-        column.valueType = {
-          name: column.range,
-          isTextType: isTextType(column.range),
-          isReferenceType: isReferenceType(schema, column.range)
-        };
+      function buildTables(rawTypes, rawTables) {
+        var tables = {};
+        angular.forEach(rawTables, function(rawTable, name) {
+          tables[name] = buildTable(rawTypes, rawTable);
+        });
+        return tables;
       }
-      function resolveColumns(schema) {
+      function resolveIndexes(schema) {
         angular.forEach(schema.tables, function(table) {
           angular.forEach(table.columns, function(column) {
-            resolveColumn(schema, column);
+            column.indexes = column.indexes.map(function(index) {
+              return schema.tables[index.table].columns[index.name];
+            });
           });
         });
       }
-      function resolveIndex(schema, column) {
-        var table = schema.tables[column.range];
-        column.sources.forEach(function(source) {
-          var columnName;
-          if (source.indexOf('.') === -1) {
-            columnName = '_key';
-          } else {
-            columnName = source.split('.')[1];
-          }
-          var targetColumn = table.columns[columnName];
-          targetColumn.indexes.push(column);
+      function buildColumn(rawTable, rawColumn) {
+        var column = {};
+        column.id       = rawColumn.id || 0;
+        column.name     = rawColumn.name;
+        column.path     = rawColumn.path || '';
+        column.type     = rawColumn.type;
+        // TODO: Wrong. It should be 'fix' or 'var'. It can be removable.
+        column.sizeType = rawColumn.type;
+        column.table    = rawTable;
+        column.flags = rawColumn.command.arguments.flags.split('|');
+        column.sources = rawColumn.sources.map(function(source) {
+          return source.full_name.replace(/\._key$/, '');
         });
+        column.valueType = {
+          name: rawColumn.value_type.name,
+          isTextType: isTextType(rawColumn.value_type.name),
+          isReferenceType: rawColumn.value_type.type === 'reference'
+        };
+        column.isScalar = column.type === 'scalar';
+        column.isVector = column.type === 'vector';
+        column.isIndex  = column.type === 'index';
+        column.range  = column.valueType && column.valueType.name; // for backward compatibility
+        column.domain = rawTable.name; // for backward compatibility
+        column.indexes = rawColumn.indexes || [];
+        return column;
       }
-      function resolveIndexes(schema) {
-        angular.forEach(schema.tables, function(table) {
-          angular.forEach(table.columns, function(column) {
-            if (column.isIndex) {
-              resolveIndex(schema, column);
+      function buildColumns(rawTypes, rawTable) {
+        var columns = {};
+        rawTable.columns._id = {
+          id:        0,
+          name:      '_id',
+          table:     rawTable.name,
+          full_name: rawTable.name + '._id',
+          type:      'scalar',
+          value_type: {
+            id:   rawTypes.UInt32.id,
+            name: 'UInt32',
+            type: 'type'
+          },
+          compress:  null,
+          section:   false,
+          weight:    false,
+          position:  false,
+          sources:   [],
+          indexes:   [],
+          command: {
+            arguments: {
+              flags: 'COLUMN_SCALAR'
             }
-          });
+          }
+        };
+        if (rawTable.type !== 'array') {
+          rawTable.columns._key = {
+            id:        0,
+            name:      '_key',
+            table:     rawTable.name,
+            full_name: rawTable.name + '._key',
+            type:      'scalar',
+            value_type: rawTable.key_type,
+            compress:  null,
+            section:   false,
+            weight:    false,
+            position:  false,
+            sources:   [],
+            indexes:   rawTable.indexes || [],
+            command: {
+              arguments: {
+                flags: 'COLUMN_SCALAR'
+              }
+            }
+          };
+        }
+        angular.forEach(rawTable.columns, function(rawColumn, name) {
+          columns[name] = buildColumn(rawTable, rawColumn);
         });
-      }
-      function addColumn(table, column) {
-        column.table = table;
-        column.indexes = [];
-        table.columns[column.name] = column;
+        return columns;
       }
-      function fetchColumns(table) {
-        table.columns = {};
-        return client.execute('column_list', {table: table.name})
-          .success(function(response) {
-            var columns = response.columns();
-            var rawIDColumn = [
-              table.id,                   // id
-              '_id',                      // name
-              table.path,                 // path
-              'fix',                      // type
-              'COLUMN_SCALAR|PERSISTENT', // flags
-              table.name,                 // domain
-              'UInt32',                   // range
-              []                          // source
-            ];
-            columns.unshift(response.parseRawColumn(rawIDColumn));
-            columns.forEach(function(column) {
-              addColumn(table, column);
-            });
+      var THREAD_LIMIT_UNKNOWN = 0;
+      function setThreadLimit(limit) {
+        return client.execute('thread_limit', { max: limit })
+          .then(function(response) {
+            return response.lastMaxLimit();
+          }, function(/* errorResponse */) {
+            return THREAD_LIMIT_UNKNOWN;
           });
       }
-      function fetchTables(schema) {
+      function fetchSchema(schema) {
         schema.tables = {};
-        return client.execute('table_list')
-          .success(function(response) {
-            response.tables().forEach(function(table) {
-              schema.tables[table.name] = table;
-            });
-            resolveTables(schema);
-            var fetchColumnsTasks = [];
-            angular.forEach(schema.tables, function(table) {
-              fetchColumnsTasks.push(fetchColumns(table));
+        var lastMaxLimitBackup;
+        return setThreadLimit(1)
+          .then(function(lastMaxLimit) {
+            lastMaxLimitBackup = lastMaxLimit;
+          })
+          .then(function() {
+            return client.execute('schema')
+                    .then(function(response) {
+                      schema.types = buildTypes(response.types());
+                      schema.tables = buildTables(response.types(),
+                                                  response.tables());
+                      resolveIndexes(schema);
+                    }, function(/* errorResponse */) {});
+          })
+          .then(function() {
+            if (lastMaxLimitBackup === THREAD_LIMIT_UNKNOWN) {
+              return;
+            }
+            return setThreadLimit(lastMaxLimitBackup);
+          })
+          .then(function() {
+            fetched = true;
+            fetching = false;
+            waitingDeferes.forEach(function(defer) {
+              defer.resolve(schema);
             });
-            return $q.all(fetchColumnsTasks)
-              .then(function() {
-                resolveColumns(schema);
-                resolveIndexes(schema);
-                fetched = true;
-                fetching = false;
-                waitingDeferes.forEach(function(defer) {
-                  defer.resolve(schema);
-                });
-                waitingDeferes = [];
-                return schema;
-              });
+            waitingDeferes = [];
+            return schema;
           });
       }
@@ -809,7 +871,7 @@ angular.module('groongaAdminApp')
           loader = defer.promise;
         } else {
           fetching = true;
-          loader = fetchTables(schema);
+          loader = fetchSchema(schema);
         }
         loader.reload = function() {
           fetching = false;
@@ -1290,9 +1352,6 @@ angular.module('groongaAdminApp')
       function selectDrilldown(key, value) {
         var queryKey = key;
-        var column = findElement($scope.table.allColumns, function(column) {
-          return column.name === key;
-        });
         var escapedValue;
         if (typeof value === 'string') {