Navigation Menu

Skip to content

Commit

Permalink
synonym table => synonyms table
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Aug 9, 2012
1 parent 9628480 commit 17e59aa
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 18 deletions.
4 changes: 2 additions & 2 deletions lib/api/2011-02-01/search.js
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions lib/database/domain.js
Expand Up @@ -155,7 +155,7 @@ Domain.prototype = {
return this.indexTableBaseName + 'BigramTerms';
},

get synonymTableName() {
get synonymsTableName() {
return this.tableName + '_synonyms';
},

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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);
},

Expand Down
4 changes: 2 additions & 2 deletions test/api-configuration.test.js
Expand Up @@ -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,
Expand Down
12 changes: 6 additions & 6 deletions test/database-domain.test.js
Expand Up @@ -304,29 +304,29 @@ suite('database', function() {

test('updateSynonymsSync', function() {
var domain = new Domain('companies', context);
assert.isFalse(domain.isSynonymTableAvailableSync());
assert.isFalse(domain.isSynonymsTableAvailableSync());

domain.updateSynonymsSync({
synonyms: {
tokio: ['tokyo'],
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);
});
Expand Down
6 changes: 6 additions & 0 deletions test/gcs-commands.test.js
Expand Up @@ -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);
Expand Down

0 comments on commit 17e59aa

Please sign in to comment.