null+****@clear*****
null+****@clear*****
2012年 7月 12日 (木) 16:20:03 JST
SHIMODA Hiroshi 2012-07-12 16:20:03 +0900 (Thu, 12 Jul 2012) New Revision: 080159a642428e67b7aa8fadaba2faa2d49fce10 https://github.com/groonga/gcs/commit/080159a642428e67b7aa8fadaba2faa2d49fce10 Log: Rename "Database" to "Context" Modified files: lib/api/2011-02-01/configuration.js lib/api/2011-02-01/search.js lib/batch/processor.js lib/batch/translator.js lib/database/domain.js lib/database/index-field.js lib/server.js lib/wrapped-nroonga.js test/api-batch.test.js test/api-configuration.test.js test/batch-processor.test.js test/search.test.js test/test-utils.js Modified: lib/api/2011-02-01/configuration.js (+47 -47) =================================================================== --- lib/api/2011-02-01/configuration.js 2012-07-12 16:07:02 +0900 (7a5e809) +++ lib/api/2011-02-01/configuration.js 2012-07-12 16:20:03 +0900 (c284b93) @@ -1,5 +1,5 @@ var path = require('path'); -var Database = require('../../wrapped-nroonga').Database; +var nroonga = require('../../wrapped-nroonga'); var Domain = require('../../database').Domain; var Translator = require('../../batch/translator').Translator; var Deferred = require('jsdeferred').Deferred; @@ -66,22 +66,22 @@ function createCreateDomainResponse(options) { '</CreateDomainResponse>'; } -handlers.CreateDomain = function(database, request, response) { +handlers.CreateDomain = function(context, request, response) { var domain = new Domain(request); var options = { name: domain.tableName, - flags: Database.TABLE_HASH_KEY, - key_type: Database.ShortText + flags: nroonga.TABLE_HASH_KEY, + key_type: nroonga.ShortText }; - database.commandDeferred('table_create', options) + context.commandDeferred('table_create', options) .next(function(data) { var termsOptions = { name: domain.termsTableName, - flags: Database.TABLE_PAT_KEY + '|' + Database.KEY_NORMALIZE, - key_type: Database.ShortText, - default_tokenizer: Database.TokenBigram + flags: nroonga.TABLE_PAT_KEY + '|' + nroonga.KEY_NORMALIZE, + key_type: nroonga.ShortText, + default_tokenizer: nroonga.TokenBigram }; - return database.commandDeferred('table_create', termsOptions); + return context.commandDeferred('table_create', termsOptions); }) .next(function(data) { var host = getBaseDomain(request.headers.host); @@ -118,13 +118,13 @@ function createDeleteDomainResponse(options) { '</DeleteDomainResponse>'; } -handlers.DeleteDomain = function(database, request, response) { +handlers.DeleteDomain = function(context, request, response) { var domain = new Domain(request); try { - database.commandSync('table_remove', { + context.commandSync('table_remove', { name: domain.tableName }); - database.commandSync('table_remove', { + context.commandSync('table_remove', { name: domain.termsTableName }); var host = getBaseDomain(request.headers.host); @@ -207,7 +207,7 @@ function createDefineIndexFieldResponse(options) { '</DefineIndexFieldResponse>'; } -handlers.DefineIndexField = function(database, request, response) { +handlers.DefineIndexField = function(context, request, response) { var domain = new Domain(request); var fieldName = request.query['IndexField.IndexFieldName'] || ''; @@ -220,23 +220,23 @@ handlers.DefineIndexField = function(database, request, response) { var resultEnabled = fieldType != 'literal'; try { if (fieldType == 'uint' || fieldType == 'literal') { - database.commandSync('table_create', { + context.commandSync('table_create', { name: field.alterTableName, - flags: Database.TABLE_HASH_KEY, + flags: nroonga.TABLE_HASH_KEY, key_type: field.fieldTypeToAlterTableKeyType(fieldType) }); alterTableName = field.alterTableName; } - database.commandSync('column_create', { + context.commandSync('column_create', { table: domain.tableName, name: field.columnName, - flags: Database.COLUMN_SCALAR, + flags: nroonga.COLUMN_SCALAR, type: columnType }); - database.commandSync('column_create', { + context.commandSync('column_create', { table: alterTableName, name: field.indexColumnName, - flags: Database.INDEX_COLUMN_DEFAULT_FLAGS, + flags: nroonga.INDEX_COLUMN_DEFAULT_FLAGS, type: domain.tableName, source: field.columnName }); @@ -268,26 +268,26 @@ function createDeleteIndexFieldResponse(options) { '</DeleteIndexFieldResponse>'; } -handlers.DeleteIndexField = function(database, request, response) { +handlers.DeleteIndexField = function(context, request, response) { var domain = new Domain(request); var fieldName = request.query['IndexFieldName'] || ''; var field = domain.getIndexField(fieldName); - var column = database.columnListSync(domain.tableName) + var column = context.columnListSync(domain.tableName) .filter(function(column) { return column.name == field.columnName; })[0]; try { - database.commandSync('column_remove', { + context.commandSync('column_remove', { table: domain.tableName, name: field.columnName }); if (column.range == field.fieldTypeToColumnType('uint') || column.range == field.fieldTypeToColumnType('literal')) { - database.commandSync('table_remove', { + context.commandSync('table_remove', { name: field.alterTableName }); } @@ -317,11 +317,11 @@ function createIndexDocumentsResponse(options) { '</IndexDocumentsResponse>'; } -handlers.IndexDocuments = function(database, request, response) { +handlers.IndexDocuments = function(context, request, response) { var domain = new Domain(request); - var indexColumns = database.columnListSync(domain.termsTableName); + var indexColumns = context.columnListSync(domain.termsTableName); indexColumns = indexColumns.filter(function(column) { - return column.flags.indexOf(Database.COLUMN_INDEX) > -1; + return column.flags.indexOf(nroonga.COLUMN_INDEX) > -1; }); try { indexColumns.forEach(function(column) { @@ -336,34 +336,34 @@ handlers.IndexDocuments = function(database, request, response) { if (column.type == field.fieldTypeToColumnType('uint') || column.type == field.fieldTypeToColumnType('literal')) { - database.commandSync('column_remove', { + context.commandSync('column_remove', { table: field.alterTableName, name: field.indexColumnName }); - database.commandSync('table_remove', { + context.commandSync('table_remove', { name: field.alterTableName }); - database.commandSync('table_create', { + context.commandSync('table_create', { name: field.alterTableName, - flags: Database.TABLE_HASH_KEY, + flags: nroonga.TABLE_HASH_KEY, key_type: field.fieldTypeToAlterTableKeyType(fieldType) }); - database.commandSync('column_create', { + context.commandSync('column_create', { table: field.alterTableName, name: field.indexColumnName, - flags: Database.INDEX_COLUMN_DEFAULT_FLAGS, + flags: nroonga.INDEX_COLUMN_DEFAULT_FLAGS, type: domain.tableName, source: field.columnName }); } else { - database.commandSync('column_remove', { + context.commandSync('column_remove', { table: domain.termsTableName, name: field.indexColumnName }); - database.commandSync('column_create', { + context.commandSync('column_create', { table: domain.termsTableName, name: field.indexColumnName, - flags: Database.INDEX_COLUMN_DEFAULT_FLAGS, + flags: nroonga.INDEX_COLUMN_DEFAULT_FLAGS, type: column.range, source: field.columnName }); @@ -410,7 +410,7 @@ function createUpdateSynonymOptionsResponse(options) { '</ResponseMetadata>' + '</UpdateSynonymOptionsResponse>'; } -handlers.UpdateSynonymOptions = function(database, request, response) { +handlers.UpdateSynonymOptions = function(context, request, response) { var domain = new Domain(request); try { var synonymOptionsJson = request.query.Synonyms; @@ -419,30 +419,30 @@ handlers.UpdateSynonymOptions = function(database, request, response) { var updatedAt = new Date(); try { - database.commandSync('table_remove', { + context.commandSync('table_remove', { table: domain.synonymTableName }); } catch(error) { // The synonym table should be inexistent. Do nothing. } - database.commandSync('table_create', { + context.commandSync('table_create', { name: domain.synonymTableName, - flags: Database.TABLE_HASH_KEY, - key_type: Database.ShortText, - flags: Database.KEY_NORMALIZE + flags: nroonga.TABLE_HASH_KEY, + key_type: nroonga.ShortText, + flags: nroonga.KEY_NORMALIZE }); - database.commandSync('column_create', { + context.commandSync('column_create', { table: domain.synonymTableName, name: 'synonyms', - type: Database.ShortText, - flags: Database.COLUMN_VECTOR + type: nroonga.ShortText, + flags: nroonga.COLUMN_VECTOR }); var load = Object.keys(synonyms).map(function(key) { return {_key: key, synonyms: synonyms[key]}; }); - database.commandSync('load', { + context.commandSync('load', { table: domain.synonymTableName, values: JSON.stringify(load) }); @@ -459,7 +459,7 @@ handlers.UpdateSynonymOptions = function(database, request, response) { } }; -exports.createHandler = function(database) { +exports.createHandler = function(context) { return function(request, response, next) { var message, body; @@ -494,6 +494,6 @@ exports.createHandler = function(database) { } var handler = handlers[action]; - handler(database, request, response); + handler(context, request, response); }; }; Modified: lib/api/2011-02-01/search.js (+10 -10) =================================================================== --- lib/api/2011-02-01/search.js 2012-07-12 16:07:02 +0900 (51d8761) +++ lib/api/2011-02-01/search.js 2012-07-12 16:20:03 +0900 (e697d75) @@ -1,5 +1,5 @@ var Domain = require('../../database').Domain; -var Database = require('../../wrapped-nroonga').Database; +var nroonga = require('../../wrapped-nroonga'); function formatSelectResults(data) { var columnList = data[0][1]; @@ -21,8 +21,8 @@ function formatSelectResults(data) { return results; } -function select(database, options, callback) { - database.command('select', options, function(error, data) { +function select(context, options, callback) { + context.command('select', options, function(error, data) { if (error) { callback(error); } else { @@ -32,20 +32,20 @@ function select(database, options, callback) { }); } -function isSynonymTableAvailableSync(database, domain) { - var results = database.commandSync('table_list'); - var tables = Database.formatResults(results); +function isSynonymTableAvailableSync(context, domain) { + var results = context.commandSync('table_list'); + var tables = nroonga.formatResults(results); return tables.some(function(table) { return table.name === domain.synonymTableName; }); } -exports.createHandler = function(database) { +exports.createHandler = function(context) { return function(request, response) { var startedAt = new Date(); var domain = new Domain(request); var query = request.query.q || ''; - var matchIndexFields = domain.getIndexFieldsSync(database); + var matchIndexFields = domain.getIndexFieldsSync(context); matchIndexFields = matchIndexFields.filter(function(field) { return field.type == 'text'; }); @@ -64,11 +64,11 @@ exports.createHandler = function(database) { match_columns: matchColumns }; - if (isSynonymTableAvailableSync(database, domain)) { + if (isSynonymTableAvailableSync(context, domain)) { options.query_expansion = domain.synonymTableName + '.synonyms'; } - select(database, options, function(error, data, numFoundRecords) { + select(context, options, function(error, data, numFoundRecords) { var finishedAt = new Date(); var elapsedTime = finishedAt - startedAt; var dummyRid = '000000000000000000000000000000000000000000000000000000000000000'; Modified: lib/batch/processor.js (+6 -6) =================================================================== --- lib/batch/processor.js 2012-07-12 16:07:02 +0900 (51c3ab2) +++ lib/batch/processor.js 2012-07-12 16:20:03 +0900 (297a9da) @@ -1,4 +1,4 @@ -var Database = require('../wrapped-nroonga').Database; +var nroonga = require('../wrapped-nroonga'). var translator = require('./translator'); var Domain = require('../database').Domain; var Deferred = require('jsdeferred').Deferred; @@ -6,7 +6,7 @@ var Deferred = require('jsdeferred').Deferred; exports.INVALID_BATCH = Processor.INVALID_BATCH = 'Invalid Batch'; function Processor(options) { - this.database = options.database || null; + this.context = options.context || null; this.databasePath = options.databasePath; this.domain = new Domain(options.domainName || options.domain); this.initialize(); @@ -14,9 +14,9 @@ function Processor(options) { Processor.prototype = { initialize: function() { - if (!this.database && !this.databasePath) + if (!this.context && !this.databasePath) throw new Error('no database path'); - this.database = new Database(this.database || this.databasePath); + this.context = new nroonga.Context(this.context || this.databasePath); this.translator = new translator.Translator(this.domain); }, getIndexFields: function() { @@ -24,7 +24,7 @@ Processor.prototype = { if (this._indexFields) { return self._indexFields; } else { - var fields = this.domain.getIndexFieldsSync(this.database); + var fields = this.domain.getIndexFieldsSync(this.context); return this._indexFields = fields; } }, @@ -90,7 +90,7 @@ Processor.prototype = { var self = this; return Deferred.loop(commandSets.length, function(i) { var commandSet = commandSets[i]; - return self.database.commandDeferred(commandSet.command, + return self.context.commandDeferred(commandSet.command, commandSet.options) .next(function(commandResult) { switch (commandSet.command) { Modified: lib/batch/translator.js (+0 -1) =================================================================== --- lib/batch/translator.js 2012-07-12 16:07:02 +0900 (045006f) +++ lib/batch/translator.js 2012-07-12 16:20:03 +0900 (e5d7986) @@ -1,5 +1,4 @@ var Domain = require('../database').Domain; -var Database = require('../wrapped-nroonga').Database; function Translator(domain) { this.domain = new Domain(domain); Modified: lib/database/domain.js (+3 -3) =================================================================== --- lib/database/domain.js 2012-07-12 16:07:02 +0900 (6efafd4) +++ lib/database/domain.js 2012-07-12 16:20:03 +0900 (5091852) @@ -1,4 +1,4 @@ -var Database = require('../wrapped-nroonga').Database; +var nroonga = require('../wrapped-nroonga'); var IndexField = require('./index-field').IndexField; exports.MINIMUM_DOMAIN_NAME_LENGTH = 3; @@ -93,10 +93,10 @@ Domain.prototype = { var type; if (column.type == 'var') { - if (column.range == Database.ShortText) + if (column.range == nroonga.ShortText) type = 'text'; } else if (column.type == 'fix') { - if (column.range == Database.UInt32) + if (column.range == nroonga.UInt32) type = 'uint'; else if (column.range == field.alterTableName) type = 'literal'; Modified: lib/database/index-field.js (+7 -7) =================================================================== --- lib/database/index-field.js 2012-07-12 16:07:02 +0900 (8606064) +++ lib/database/index-field.js 2012-07-12 16:20:03 +0900 (be5297a) @@ -1,4 +1,4 @@ -var Database = require('../wrapped-nroonga').Database; +var nroonga = require('../wrapped-nroonga'); exports.MINIMUM_FIELD_NAME_LENGTH = 3; exports.MAXIMUM_FIELD_NAME_LENGTH = 64; @@ -72,9 +72,9 @@ IndexField.prototype = { fieldTypeToColumnType: function(fieldType) { switch (fieldType) { case 'text': - return Database.ShortText; + return nroonga.ShortText; case 'uint': - return Database.UInt32; + return nroonga.UInt32; case 'literal': return this.alterTableName; default: @@ -83,9 +83,9 @@ IndexField.prototype = { }, columnTypeToFieldType: function(columnType) { switch (columnType) { - case Database.ShortText: + case nroonga.ShortText: return 'text'; - case Database.UInt32: + case nroonga.UInt32: return 'uint'; case this.alterTableName: return 'literal'; @@ -96,9 +96,9 @@ IndexField.prototype = { fieldTypeToAlterTableKeyType: function(fieldType) { switch (fieldType) { case 'uint': - return Database.UInt32; + return nroonga.UInt32; case 'literal': - return Database.ShortText; + return nroonga.ShortText; default: throw new Error('Unsupported index field type '+fieldType+ ' for alter table'); Modified: lib/server.js (+3 -3) =================================================================== --- lib/server.js 2012-07-12 16:07:02 +0900 (acd9ee3) +++ lib/server.js 2012-07-12 16:20:03 +0900 (78c2e1b) @@ -1,10 +1,10 @@ var express = require('express'); -var Database = require('./wrapped-nroonga').Database; +var nroonga = require('./wrapped-nroonga'); var api = require('./api'); var dashboard = require('./dashboard'); exports.createServer = function (config) { - var database = new Database(config.database || config.databasePath); + var context = new nroonga.Context(config.context || config.databasePath); var application = express.createServer(); application.use(express.bodyParser()); application.set('views', __dirname + '/../views'); @@ -14,7 +14,7 @@ exports.createServer = function (config) { }); api.versions.forEach(function(version) { - api[version].registerHandlers(application, database); + api[version].registerHandlers(application, context); }); application.get('/', dashboard.handler); Modified: lib/wrapped-nroonga.js (+25 -36) =================================================================== --- lib/wrapped-nroonga.js 2012-07-12 16:07:02 +0900 (aac4848) +++ lib/wrapped-nroonga.js 2012-07-12 16:20:03 +0900 (d793d04) @@ -4,65 +4,54 @@ var path = require('path'); var mkdirp = require('mkdirp'); var ShortText = - exports.ShortText = - Database.ShortText = 'ShortText'; + exports.ShortText = 'ShortText'; var UInt32 = - exports.UInt32 = - Database.UInt32 = 'UInt32'; + exports.UInt32 = 'UInt32'; var TABLE_HASH_KEY = - exports.TABLE_HASH_KEY = - Database.TABLE_HASH_KEY = 'TABLE_HASH_KEY'; + exports.TABLE_HASH_KEY = 'TABLE_HASH_KEY'; var TABLE_PAT_KEY = - exports.TABLE_PAT_KEY = - Database.TABLE_PAT_KEY = 'TABLE_PAT_KEY'; + exports.TABLE_PAT_KEY = 'TABLE_PAT_KEY'; var KEY_NORMALIZE = - exports.KEY_NORMALIZE = - Database.KEY_NORMALIZE = 'KEY_NORMALIZE'; + exports.KEY_NORMALIZE = 'KEY_NORMALIZE'; var COLUMN_SCALAR = - exports.COLUMN_SCALAR = - Database.COLUMN_SCALAR = 'COLUMN_SCALAR'; + exports.COLUMN_SCALAR = 'COLUMN_SCALAR'; var COLUMN_INDEX = - exports.COLUMN_INDEX = - Database.COLUMN_INDEX = 'COLUMN_INDEX'; + exports.COLUMN_INDEX = 'COLUMN_INDEX'; var COLUMN_VECTOR = - exports.COLUMN_VECTOR = - Database.COLUMN_VECTOR = 'COLUMN_VECTOR'; + exports.COLUMN_VECTOR = 'COLUMN_VECTOR'; var WITH_POSITION = - exports.WITH_POSITION = - Database.WITH_POSITION = 'WITH_POSITION'; + exports.WITH_POSITION = 'WITH_POSITION'; var INDEX_COLUMN_DEFAULT_FLAGS = - exports.INDEX_COLUMN_DEFAULT_FLAGS = - Database.INDEX_COLUMN_DEFAULT_FLAGS = COLUMN_INDEX + '|' + WITH_POSITION; + exports.INDEX_COLUMN_DEFAULT_FLAGS = COLUMN_INDEX + '|' + WITH_POSITION; var TokenBigram = - exports.TokenBigram = - Database.TokenBigram = 'TokenBigram'; + exports.TokenBigram = 'TokenBigram'; -function Database(source) { +function Context(source) { if (typeof source == 'string') { // path mkdirp.sync(path.dirname(source)); - this._database = new nroonga.Database(source); + this._context = new nroonga.Database(source); } else if (source instanceof nroonga.Database) - this._database = source; + this._context = source; else return source; } -Database.prototype = { +Context.prototype = { command: function() { - return this._database.command.apply(this._database, arguments); + return this._context.command.apply(this._context, arguments); }, commandSync: function() { - return this._database.commandSync.apply(this._database, arguments); + return this._context.commandSync.apply(this._context, arguments); }, commandString: function() { - return this._database.commandString.apply(this._database, arguments); + return this._context.commandString.apply(this._context, arguments); }, commandSyncString: function() { - return this._database.commandSyncString.apply(this._database, arguments); + return this._context.commandSyncString.apply(this._context, arguments); }, commandDeferred: function(command, options) { var deferred = new Deferred(); @@ -74,15 +63,15 @@ Database.prototype = { }; if (options) - this._database.command(command, options, callback); + this._context.command(command, options, callback); else - this._database.command(command, callback); + this._context.command(command, callback); return deferred; }, commandDeferredString: function(command) { var deferred = new Deferred(); - this._database.commandString(command, function(error, data) { + this._context.commandString(command, function(error, data) { if (error) deferred.fail(error); else @@ -93,7 +82,7 @@ Database.prototype = { columnListSync: function(tableName) { var result = this.commandSync('column_list', { table: tableName }); - return Database.formatResults(result); + return formatResults(result); }, ordinalColumnsSync: function(tableName) { var columns = this.columnListSync(tableName); @@ -104,9 +93,9 @@ Database.prototype = { } }; -exports.Database = Database; +exports.Database = exports.Context = Context; -exports.formatResults = Database.formatResults = function(results) { +exports.formatResults = function(results) { if (!results || !results.length) return []; Modified: test/api-batch.test.js (+6 -6) =================================================================== --- test/api-batch.test.js 2012-07-12 16:07:02 +0900 (3b0baa0) +++ test/api-batch.test.js 2012-07-12 16:20:03 +0900 (d262f7a) @@ -21,13 +21,13 @@ suiteTeardown(function() { }); suite('documents/batch API', function() { - var database; + var context; var server; setup(function() { - database = temporaryDatabase.get(); - utils.loadDumpFile(database, __dirname + '/fixture/companies/ddl.grn'); - server = utils.setupServer(database); + context = temporaryDatabase.get(); + utils.loadDumpFile(context, __dirname + '/fixture/companies/ddl.grn'); + server = utils.setupServer(context); }); teardown(function() { @@ -53,7 +53,7 @@ suite('documents/batch API', function() { }; assert.deepEqual(response, expected); - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); assert.equal(dump, schemeDump + '\n' + loadDump); @@ -90,7 +90,7 @@ suite('documents/batch API', function() { }; assert.deepEqual(response, expected); - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); assert.equal(dump, schemeDump + '\n' + deletedLoadDump); Modified: test/api-configuration.test.js (+13 -13) =================================================================== --- test/api-configuration.test.js 2012-07-12 16:07:02 +0900 (416e241) +++ test/api-configuration.test.js 2012-07-12 16:20:03 +0900 (073f317) @@ -23,13 +23,13 @@ function replaceXMLDates(str) { suite('Configuration API', function() { var temporaryDatabase; - var database; + var context; var server; setup(function() { temporaryDatabase = utils.createTemporaryDatabase(); - database = temporaryDatabase.get(); - server = utils.setupServer(database); + context = temporaryDatabase.get(); + server = utils.setupServer(context); }); teardown(function() { @@ -44,7 +44,7 @@ suite('Configuration API', function() { 'Host': 'cloudsearch.localhost' }) .next(function(response) { - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + @@ -100,7 +100,7 @@ suite('Configuration API', function() { }); }) .next(function(response) { - var dump = database.commandSync('dump'); + var dump = context.commandSync('dump'); var expected = ''; assert.equal(dump, expected); @@ -152,7 +152,7 @@ suite('Configuration API', function() { return utils.get(path); }) .next(function(response) { - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + @@ -217,7 +217,7 @@ suite('Configuration API', function() { return utils.get(path); }) .next(function(response) { - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + @@ -282,7 +282,7 @@ suite('Configuration API', function() { return utils.get(path); }) .next(function(response) { - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + @@ -355,7 +355,7 @@ suite('Configuration API', function() { return utils.get(path); }) .next(function(response) { - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + @@ -404,7 +404,7 @@ suite('Configuration API', function() { return utils.get(path); }) .next(function(response) { - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + @@ -453,7 +453,7 @@ suite('Configuration API', function() { return utils.get(path); }) .next(function(response) { - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + @@ -507,7 +507,7 @@ suite('Configuration API', function() { return utils.get(path); }) .next(function(response) { - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + @@ -593,7 +593,7 @@ suite('Configuration API', function() { '["tokio",["tokyo"]],\n' + '["dekkaido",["hokkaido"]]\n' + ']'; - var dumpActual = database.commandSync('dump', { + var dumpActual = context.commandSync('dump', { tables: 'companies_synonyms' }); assert.equal(dumpExpected, dumpActual); Modified: test/batch-processor.test.js (+6 -6) =================================================================== --- test/batch-processor.test.js 2012-07-12 16:07:02 +0900 (c1dde8c) +++ test/batch-processor.test.js 2012-07-12 16:20:03 +0900 (5ab84e9) @@ -24,15 +24,15 @@ suiteTeardown(function() { suite('batch/processor/Processor (instance methods)', function() { var processor; - var database; + var context; setup(function() { - database = temporaryDatabase.get(); - utils.loadDumpFile(database, __dirname + '/fixture/companies/ddl.grn'); + context = temporaryDatabase.get(); + utils.loadDumpFile(context, __dirname + '/fixture/companies/ddl.grn'); processor = new Processor({ databasePath: temporaryDatabase.path, - database: database, // we must reuse the existing connection! + context: context, // we must reuse the existing connection! domain: 'companies', }); }); @@ -85,7 +85,7 @@ suite('batch/processor/Processor (instance methods)', function() { deletes: 0 }; assert.deepEqual(result, expected); - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); assert.equal(dump, schemeDump + '\n' + loadDump); @@ -112,7 +112,7 @@ suite('batch/processor/Processor (instance methods)', function() { deletes: 1 }; assert.deepEqual(result, expected); - var dump = database.commandSync('dump', { + var dump = context.commandSync('dump', { tables: 'companies' }); assert.equal(dump, schemeDump + '\n' + deletedLoadDump); Modified: test/search.test.js (+8 -8) =================================================================== --- test/search.test.js 2012-07-12 16:07:02 +0900 (0a13034) +++ test/search.test.js 2012-07-12 16:20:03 +0900 (394f6bf) @@ -5,13 +5,13 @@ var fs = require('fs'); suite('Search API', function() { var server; - var database; + var context; var temporaryDatabase; setup(function() { temporaryDatabase = utils.createTemporaryDatabase(); - database = temporaryDatabase.get(); - server = utils.setupServer(database); + context = temporaryDatabase.get(); + server = utils.setupServer(context); }); teardown(function() { @@ -42,8 +42,8 @@ suite('Search API', function() { suite('with fixture loaded', function() { setup(function() { - utils.loadDumpFile(database, __dirname + '/fixture/companies/ddl.grn'); - utils.loadDumpFile(database, __dirname + '/fixture/companies/data.grn'); + utils.loadDumpFile(context, __dirname + '/fixture/companies/ddl.grn'); + utils.loadDumpFile(context, __dirname + '/fixture/companies/data.grn'); }); testSearch('/2011-02-01/search?q=Hongo', @@ -284,9 +284,9 @@ suite('Search API', function() { suite('with fixture and synonyms loaded', function() { setup(function() { - utils.loadDumpFile(database, __dirname + '/fixture/companies/ddl.grn'); - utils.loadDumpFile(database, __dirname + '/fixture/companies/data.grn'); - utils.loadDumpFile(database, __dirname + '/fixture/companies/synonyms.grn'); + utils.loadDumpFile(context, __dirname + '/fixture/companies/ddl.grn'); + utils.loadDumpFile(context, __dirname + '/fixture/companies/data.grn'); + utils.loadDumpFile(context, __dirname + '/fixture/companies/synonyms.grn'); }); testSearch('/2011-02-01/search?q=Tokio', Modified: test/test-utils.js (+12 -12) =================================================================== --- test/test-utils.js 2012-07-12 16:07:02 +0900 (e620852) +++ test/test-utils.js 2012-07-12 16:20:03 +0900 (9f638fc) @@ -5,7 +5,7 @@ var gcsServer = require(__dirname + '/../lib/server'); var http = require('http'); var Deferred = require('jsdeferred').Deferred; var nroonga = require('nroonga'); -var Database = require(__dirname + '/../lib/wrapped-nroonga').Database; +var wrappedNroonga = require(__dirname + '/../lib/wrapped-nroonga'); var temporaryDirectory = exports.temporaryDirectory = path.join(__dirname, 'tmp'); @@ -14,8 +14,8 @@ var testPort = 3333; exports.testHost = testHost; exports.testPort = testPort; -function setupServer(database) { - var server = gcsServer.createServer({database: database}); +function setupServer(context) { + var server = gcsServer.createServer({context: context}); server.listen(testPort); return server; } @@ -84,27 +84,27 @@ exports.createTemporaryDatabase = function() { return { path: databasePath, get: function() { - return this._database || - (this._database = new nroonga.Database(databasePath)); + return this._context || + (this._context = new nroonga.Database(databasePath)); }, clear: function() { - var database = this._database; - var tables = database.commandSync('table_list'); - Database.formatResults(tables).forEach(function(table) { - database.commandSync('table_remove', { name: table.name }); + var context = this._context; + var tables = context.commandSync('table_list'); + wrappedNroonga.formatResults(tables).forEach(function(table) { + context.commandSync('table_remove', { name: table.name }); }); }, teardown: function() { rmRSync(databaseDirectory); - this._database = undefined; + this._context = undefined; } }; }; -exports.loadDumpFile = function(database, path) { +exports.loadDumpFile = function(context, path) { var dump = fs.readFileSync(path, 'UTF-8'); dump.split('\n').forEach(function(line) { - database.commandSyncString(line); + context.commandSyncString(line); }); } -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download