null+****@clear*****
null+****@clear*****
2012年 8月 9日 (木) 14:34:46 JST
SHIMODA Hiroshi 2012-08-09 14:34:46 +0900 (Thu, 09 Aug 2012) New Revision: 17e59aa3cc092bde00431338c18881458d0b3004 https://github.com/groonga/gcs/commit/17e59aa3cc092bde00431338c18881458d0b3004 Log: synonym table => synonyms table Modified files: lib/api/2011-02-01/search.js lib/database/domain.js test/api-configuration.test.js test/database-domain.test.js test/gcs-commands.test.js Modified: lib/api/2011-02-01/search.js (+2 -2) =================================================================== --- lib/api/2011-02-01/search.js 2012-08-09 13:56:10 +0900 (1d0710b) +++ lib/api/2011-02-01/search.js 2012-08-09 14:34:46 +0900 (3419252) @@ -125,8 +125,8 @@ exports.createHandler = function(context) { match_columns: matchColumns }; - if (domain.isSynonymTableAvailableSync()) { - options.query_expansion = domain.synonymTableName + '.synonyms'; + if (domain.isSynonymsTableAvailableSync()) { + options.query_expansion = domain.synonymsTableName + '.synonyms'; } if (filter) { options.filter = filter; Modified: lib/database/domain.js (+8 -8) =================================================================== --- lib/database/domain.js 2012-08-09 13:56:10 +0900 (1457332) +++ lib/database/domain.js 2012-08-09 14:34:46 +0900 (9b261ec) @@ -155,7 +155,7 @@ Domain.prototype = { return this.indexTableBaseName + 'BigramTerms'; }, - get synonymTableName() { + get synonymsTableName() { return this.tableName + '_synonyms'; }, @@ -257,7 +257,7 @@ Domain.prototype = { throw new Error('no context'); var options = { - table: this.synonymTableName, + table: this.synonymsTableName, limit: -1, offset: 0, output_columns: '_key,' + SYNONYMS_COLUMN @@ -281,20 +281,20 @@ Domain.prototype = { try { this.context.commandSync('table_remove', { - table: this.synonymTableName + table: this.synonymsTableName }); } catch (error) { // The synonym table should be inexistent. Do nothing. } this.context.commandSync('table_create', { - name: this.synonymTableName, + name: this.synonymsTableName, flags: nroonga.TABLE_HASH_KEY, key_type: nroonga.ShortText, flags: nroonga.KEY_NORMALIZE }); this.context.commandSync('column_create', { - table: this.synonymTableName, + table: this.synonymsTableName, name: SYNONYMS_COLUMN, type: nroonga.ShortText, flags: nroonga.COLUMN_VECTOR @@ -304,15 +304,15 @@ Domain.prototype = { return {_key: key, synonyms: synonyms[key]}; }); this.context.commandSync('load', { - table: this.synonymTableName, + table: this.synonymsTableName, values: JSON.stringify(load) }); }, - isSynonymTableAvailableSync: function() { + isSynonymsTableAvailableSync: function() { var tables = this.context.tableListSync(); return tables.some(function(table) { - return table.name === this.synonymTableName; + return table.name === this.synonymsTableName; }, this); }, Modified: test/api-configuration.test.js (+2 -2) =================================================================== --- test/api-configuration.test.js 2012-08-09 13:56:10 +0900 (7e474c8) +++ test/api-configuration.test.js 2012-08-09 14:34:46 +0900 (5e0527b) @@ -777,14 +777,14 @@ suite('Configuration API', function() { }) .next(function() { domain = new Domain('companies', context); - assert.isFalse(domain.isSynonymTableAvailableSync()); + assert.isFalse(domain.isSynonymsTableAvailableSync()); }) .get('/?Version=2011-02-01&Action=UpdateSynonymOptions&' + 'DomainName=companies&Synonyms='+synonyms, { 'Host': 'cloudsearch.localhost' }) .next(function(response) { - assert.isTrue(domain.isSynonymTableAvailableSync()); + assert.isTrue(domain.isSynonymsTableAvailableSync()); response = toParsedResponse(response); assert.deepEqual(response.pattern, Modified: test/database-domain.test.js (+6 -6) =================================================================== --- test/database-domain.test.js 2012-08-09 13:56:10 +0900 (7f2d002) +++ test/database-domain.test.js 2012-08-09 14:34:46 +0900 (24407f1) @@ -304,7 +304,7 @@ suite('database', function() { test('updateSynonymsSync', function() { var domain = new Domain('companies', context); - assert.isFalse(domain.isSynonymTableAvailableSync()); + assert.isFalse(domain.isSynonymsTableAvailableSync()); domain.updateSynonymsSync({ synonyms: { @@ -312,21 +312,21 @@ suite('database', function() { dekkaido: 'hokkaido' } }); - assert.isTrue(domain.isSynonymTableAvailableSync()); + assert.isTrue(domain.isSynonymsTableAvailableSync()); var dumpExpected = - 'table_create ' + domain.synonymTableName + ' ' + + 'table_create ' + domain.synonymsTableName + ' ' + 'TABLE_HASH_KEY|KEY_NORMALIZE ShortText\n' + - 'column_create ' + domain.synonymTableName + ' ' + + 'column_create ' + domain.synonymsTableName + ' ' + 'synonyms COLUMN_VECTOR ShortText\n' + - 'load --table ' + domain.synonymTableName + '\n' + + 'load --table ' + domain.synonymsTableName + '\n' + '[\n' + '["_key","synonyms"],\n' + '["tokio",["tokyo"]],\n' + '["dekkaido",["hokkaido"]]\n' + ']'; var dumpActual = context.commandSync('dump', { - tables: domain.synonymTableName + tables: domain.synonymsTableName }); assert.equal(dumpExpected, dumpActual); }); Modified: test/gcs-commands.test.js (+6 -0) =================================================================== --- test/gcs-commands.test.js 2012-08-09 13:56:10 +0900 (dd8f457) +++ test/gcs-commands.test.js 2012-08-09 14:34:46 +0900 (f02a7ae) @@ -419,6 +419,12 @@ suite('gcs-configure-fields', function() { }); }); +suite('gcs-configure-text-options', function() { + setup(commonSetup); + teardown(commonTeardown); + +}); + suite('gcs-index-documents', function() { setup(commonSetup); teardown(commonTeardown); -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download