null+****@clear*****
null+****@clear*****
2012年 8月 1日 (水) 15:08:41 JST
piro 2012-08-01 15:08:41 +0900 (Wed, 01 Aug 2012) New Revision: 479a3f9e3c9f2eb5fce642b89055dc2c091d2459 https://github.com/groonga/gcs/commit/479a3f9e3c9f2eb5fce642b89055dc2c091d2459 Log: Add domain ID to generated table name Modified files: lib/database/domain.js test/api-batch.test.js test/api-configuration.test.js test/batch-processor.test.js test/batch-translator.test.js test/database-domain.test.js test/database-index-field.test.js test/fixture/companies/data-deleted.grn test/fixture/companies/data.grn test/fixture/companies/ddl.grn test/fixture/companies/delete.grn test/fixture/companies/synonyms.grn Modified: lib/database/domain.js (+9 -5) =================================================================== --- lib/database/domain.js 2012-08-01 14:44:34 +0900 (a971390) +++ lib/database/domain.js 2012-08-01 15:08:41 +0900 (5d1b438) @@ -7,9 +7,9 @@ exports.MAXIMUM_DOMAIN_NAME_LENGTH = 28; exports.INVALID_DOMAIN_NAME_CHARACTER_PATTERN = /[^\-a-z0-9]/g; exports.INVALID_TABLE_NAME_CHARACTER_PATTERN = /[^_a-z0-9]/g; -var FAKE_DOMAIN_ID = - exports.FAKE_DOMAIN_ID = - Domain.FAKE_DOMAIN_ID = '00000000000000000000000000'; +var DEFAULT_DOMAIN_ID = + exports.DEFAULT_DOMAIN_ID = + Domain.DEFAULT_DOMAIN_ID = '00000000000000000000000000'; function assertValidDomainName(domain) { if (typeof domain != 'string') @@ -88,7 +88,7 @@ Domain.prototype = { get tableName() { if (!this._tableName) { assertValidDomainName(this.name); - this._tableName = this.name; + this._tableName = this.name + '_' + this.id; } return this._tableName; }, @@ -122,8 +122,12 @@ Domain.prototype = { }, get id() { - return FAKE_DOMAIN_ID; + return this._id || DEFAULT_DOMAIN_ID; }, + set id(value) { + return this._id = value; + }, + get domainId() { return this.id + '/' + this.name; }, Modified: test/api-batch.test.js (+2 -2) =================================================================== --- test/api-batch.test.js 2012-08-01 14:44:34 +0900 (71ffa16) +++ test/api-batch.test.js 2012-08-01 15:08:41 +0900 (c09d7bb) @@ -47,7 +47,7 @@ suite('documents/batch API', function() { assert.deepEqual(response, expected); var dump = context.commandSync('dump', { - tables: 'companies' + tables: 'companies_00000000000000000000000000' }); assert.equal(dump, schemeDump + '\n' + loadDump); @@ -83,7 +83,7 @@ suite('documents/batch API', function() { assert.deepEqual(response, expected); var dump = context.commandSync('dump', { - tables: 'companies' + tables: 'companies_00000000000000000000000000' }); assert.equal(dump, schemeDump + '\n' + deletedLoadDump); Modified: test/api-configuration.test.js (+44 -44) =================================================================== --- test/api-configuration.test.js 2012-08-01 14:44:34 +0900 (df1d11d) +++ test/api-configuration.test.js 2012-08-01 15:08:41 +0900 (48d9daa) @@ -236,8 +236,8 @@ suite('Configuration API', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expectedDump = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'table_create companies_BigramTerms ' + + var expectedDump = 'table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText\n' + + 'table_create companies_00000000000000000000000000_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram'; assert.equal(dump, expectedDump); @@ -250,16 +250,16 @@ suite('Configuration API', function() { Created: 'true', Deleted: 'false', DocService: { - Endpoint: 'doc-companies-' + Domain.FAKE_DOMAIN_ID + '.localhost' + Endpoint: 'doc-companies-' + Domain.DEFAULT_DOMAIN_ID + '.localhost' }, - DomainId: Domain.FAKE_DOMAIN_ID + '/companies', + DomainId: Domain.DEFAULT_DOMAIN_ID + '/companies', DomainName: 'companies', NumSearchableDocs: '0', RequiresIndexDocuments: 'false', SearchInstanceCount: '0', SearchPartitionCount: '0', SearchService: { - Endpoint: 'search-companies-' + Domain.FAKE_DOMAIN_ID + '.localhost' + Endpoint: 'search-companies-' + Domain.DEFAULT_DOMAIN_ID + '.localhost' } }; var status = response.body.CreateDomainResponse.CreateDomainResult.DomainStatus; @@ -293,16 +293,16 @@ suite('Configuration API', function() { Created: 'false', Deleted: 'true', DocService: { - Endpoint: 'doc-companies-' + Domain.FAKE_DOMAIN_ID + '.localhost' + Endpoint: 'doc-companies-' + Domain.DEFAULT_DOMAIN_ID + '.localhost' }, - DomainId: Domain.FAKE_DOMAIN_ID + '/companies', + DomainId: Domain.DEFAULT_DOMAIN_ID + '/companies', DomainName: 'companies', NumSearchableDocs: '0', RequiresIndexDocuments: 'false', SearchInstanceCount: '0', SearchPartitionCount: '0', SearchService: { - Endpoint: 'search-companies-' + Domain.FAKE_DOMAIN_ID + '.localhost' + Endpoint: 'search-companies-' + Domain.DEFAULT_DOMAIN_ID + '.localhost' } }; var status = response.body.DeleteDomainResponse.DeleteDomainResult.DomainStatus; @@ -327,13 +327,13 @@ suite('Configuration API', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'column_create companies name COLUMN_SCALAR ShortText\n' + - 'table_create companies_BigramTerms ' + + var expected = 'table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText\n' + + 'column_create companies_00000000000000000000000000 name COLUMN_SCALAR ShortText\n' + + 'table_create companies_00000000000000000000000000_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + - 'column_create companies_BigramTerms companies_name ' + - 'COLUMN_INDEX|WITH_POSITION companies name'; + 'column_create companies_00000000000000000000000000_BigramTerms companies_00000000000000000000000000_name ' + + 'COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 name'; assert.equal(dump, expected); response = toParsedResponse(response); @@ -371,15 +371,15 @@ suite('Configuration API', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'column_create companies age COLUMN_SCALAR UInt32\n' + - 'table_create companies_BigramTerms ' + + var expected = 'table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText\n' + + 'column_create companies_00000000000000000000000000 age COLUMN_SCALAR UInt32\n' + + 'table_create companies_00000000000000000000000000_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + - 'table_create companies_age ' + + 'table_create companies_00000000000000000000000000_age ' + 'TABLE_HASH_KEY UInt32\n' + - 'column_create companies_age companies_age ' + - 'COLUMN_INDEX|WITH_POSITION companies age'; + 'column_create companies_00000000000000000000000000_age companies_00000000000000000000000000_age ' + + 'COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 age'; assert.equal(dump, expected); response = toParsedResponse(response); @@ -415,15 +415,15 @@ suite('Configuration API', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'table_create companies_BigramTerms ' + + var expected = 'table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText\n' + + 'table_create companies_00000000000000000000000000_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + - 'table_create companies_member ' + + 'table_create companies_00000000000000000000000000_member ' + 'TABLE_HASH_KEY ShortText\n' + - 'column_create companies_member companies_member ' + - 'COLUMN_INDEX|WITH_POSITION companies member\n' + - 'column_create companies member COLUMN_SCALAR companies_member'; + 'column_create companies_00000000000000000000000000_member companies_00000000000000000000000000_member ' + + 'COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 member\n' + + 'column_create companies_00000000000000000000000000 member COLUMN_SCALAR companies_00000000000000000000000000_member'; assert.equal(dump, expected); response = toParsedResponse(response); @@ -464,8 +464,8 @@ suite('Configuration API', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'table_create companies_BigramTerms ' + + var expected = 'table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText\n' + + 'table_create companies_00000000000000000000000000_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram'; assert.equal(dump, expected); @@ -496,8 +496,8 @@ suite('Configuration API', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'table_create companies_BigramTerms ' + + var expected = 'table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText\n' + + 'table_create companies_00000000000000000000000000_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram'; assert.equal(dump, expected); @@ -528,8 +528,8 @@ suite('Configuration API', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'table_create companies_BigramTerms ' + + var expected = 'table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText\n' + + 'table_create companies_00000000000000000000000000_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram'; assert.equal(dump, expected); @@ -562,17 +562,17 @@ suite('Configuration API', function() { var dump = context.commandSync('dump', { tables: 'companies' }); - var expected = 'table_create companies TABLE_HASH_KEY ShortText\n' + - 'column_create companies age COLUMN_SCALAR UInt32\n' + - 'column_create companies name COLUMN_SCALAR ShortText\n' + - 'table_create companies_BigramTerms ' + + var expected = 'table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText\n' + + 'column_create companies_00000000000000000000000000 age COLUMN_SCALAR UInt32\n' + + 'column_create companies_00000000000000000000000000 name COLUMN_SCALAR ShortText\n' + + 'table_create companies_00000000000000000000000000_BigramTerms ' + 'TABLE_PAT_KEY|KEY_NORMALIZE ShortText ' + '--default_tokenizer TokenBigram\n' + - 'table_create companies_age TABLE_HASH_KEY UInt32\n' + - 'column_create companies_age companies_age ' + - 'COLUMN_INDEX|WITH_POSITION companies age\n' + - 'column_create companies_BigramTerms companies_name ' + - 'COLUMN_INDEX|WITH_POSITION companies name'; + 'table_create companies_00000000000000000000000000_age TABLE_HASH_KEY UInt32\n' + + 'column_create companies_00000000000000000000000000_age companies_00000000000000000000000000_age ' + + 'COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 age\n' + + 'column_create companies_00000000000000000000000000_BigramTerms companies_00000000000000000000000000_name ' + + 'COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 name'; assert.equal(dump, expected); var expectedFieldNames = ['age', 'name']; @@ -617,16 +617,16 @@ suite('Configuration API', function() { }) .next(function(response) { var dumpExpected = - 'table_create companies_synonyms TABLE_HASH_KEY|KEY_NORMALIZE ShortText\n' + - 'column_create companies_synonyms synonyms COLUMN_VECTOR ShortText\n' + - 'load --table companies_synonyms\n' + + 'table_create companies_00000000000000000000000000_synonyms TABLE_HASH_KEY|KEY_NORMALIZE ShortText\n' + + 'column_create companies_00000000000000000000000000_synonyms synonyms COLUMN_VECTOR ShortText\n' + + 'load --table companies_00000000000000000000000000_synonyms\n' + '[\n' + '["_key","synonyms"],\n' + '["tokio",["tokyo"]],\n' + '["dekkaido",["hokkaido"]]\n' + ']'; var dumpActual = context.commandSync('dump', { - tables: 'companies_synonyms' + tables: 'companies_00000000000000000000000000_synonyms' }); assert.equal(dumpExpected, dumpActual); Modified: test/batch-processor.test.js (+2 -2) =================================================================== --- test/batch-processor.test.js 2012-08-01 14:44:34 +0900 (8c95231) +++ test/batch-processor.test.js 2012-08-01 15:08:41 +0900 (5806529) @@ -52,7 +52,7 @@ suite('batch/processor/Processor (instance methods)', function() { }; assert.deepEqual(result, expected); var dump = context.commandSync('dump', { - tables: 'companies' + tables: 'companies_00000000000000000000000000' }); assert.equal(dump, schemeDump + '\n' + loadDump); done(); @@ -79,7 +79,7 @@ suite('batch/processor/Processor (instance methods)', function() { }; assert.deepEqual(result, expected); var dump = context.commandSync('dump', { - tables: 'companies' + tables: 'companies_00000000000000000000000000' }); assert.equal(dump, schemeDump + '\n' + deletedLoadDump); done(); Modified: test/batch-translator.test.js (+17 -17) =================================================================== --- test/batch-translator.test.js 2012-08-01 14:44:34 +0900 (0e0be35) +++ test/batch-translator.test.js 2012-08-01 15:08:41 +0900 (ae16f0f) @@ -25,7 +25,7 @@ suite('batch/translator/Translator (instance methods)', function() { var expected = { command: 'load', options: { - table: 'test', + table: 'test_00000000000000000000000000', values: JSON.stringify([{ '_key': batch['id'], 'name': batch['fields']['name'], @@ -45,7 +45,7 @@ suite('batch/translator/Translator (instance methods)', function() { var expected = { command: 'delete', options: { - table: 'test', + table: 'test_00000000000000000000000000', key: batch['id'] } }; @@ -58,7 +58,7 @@ suite('batch/translator/Translator (instance methods)', function() { var expected = { command: 'load', options: { - table: 'test', + table: 'test_00000000000000000000000000', values: JSON.stringify([{ '_key': batch['id'], 'name': batch['fields']['name'], @@ -78,7 +78,7 @@ suite('batch/translator/Translator (instance methods)', function() { var expected = { command: 'delete', options: { - table: 'test', + table: 'test_00000000000000000000000000', key: batch['id'] } }; @@ -92,7 +92,7 @@ suite('batch/translator/Translator (instance methods)', function() { { command: 'load', options: { - table: 'test', + table: 'test_00000000000000000000000000', values: JSON.stringify([{ '_key': batches[0]['id'], 'name': batches[0]['fields']['name'], @@ -106,7 +106,7 @@ suite('batch/translator/Translator (instance methods)', function() { { command: 'load', options: { - table: 'test', + table: 'test_00000000000000000000000000', values: JSON.stringify([{ '_key': batches[1]['id'], 'name': batches[1]['fields']['name'], @@ -120,7 +120,7 @@ suite('batch/translator/Translator (instance methods)', function() { { command: 'delete', options: { - table: 'test', + table: 'test_00000000000000000000000000', key: batches[2]['id'] } } @@ -138,7 +138,7 @@ suite('batch/translator/Translator (class methods)', function() { var command = { command: 'load', options: { - table: 'test', + table: 'test_00000000000000000000000000', values: JSON.stringify([{ '_key': batch['id'], 'name': batch['fields']['name'], @@ -147,7 +147,7 @@ suite('batch/translator/Translator (class methods)', function() { }]) } }; - var expected = 'load --table test --values ' + command.options.values; + var expected = 'load --table test_00000000000000000000000000 --values ' + command.options.values; var stringified = Translator.commandToString(command); assert.equal(stringified, expected); }); @@ -158,11 +158,11 @@ suite('batch/translator/Translator (class methods)', function() { var command = { command: 'delete', options: { - table: 'test', + table: 'test_00000000000000000000000000', key: batch['id'] } }; - var expected = 'delete --table test --key ' + command.options.key; + var expected = 'delete --table test_00000000000000000000000000 --key ' + command.options.key; var stringified = Translator.commandToString(command); assert.equal(stringified, expected); }); @@ -175,7 +175,7 @@ suite('batch/translator/Translator (class methods)', function() { { command: 'load', options: { - table: 'test', + table: 'test_00000000000000000000000000', values: JSON.stringify([{ '_key': batches[0]['id'], 'name': batches[0]['fields']['name'], @@ -187,7 +187,7 @@ suite('batch/translator/Translator (class methods)', function() { { command: 'load', options: { - table: 'test', + table: 'test_00000000000000000000000000', values: JSON.stringify([{ '_key': batches[1]['id'], 'name': batches[1]['fields']['name'], @@ -199,15 +199,15 @@ suite('batch/translator/Translator (class methods)', function() { { command: 'delete', options: { - table: 'test', + table: 'test_00000000000000000000000000', key: batches[2]['id'] } } ]; var expected = [ - 'load --table test --values ' + commands[0].options.values, - 'load --table test --values ' + commands[1].options.values, - 'delete --table test --key ' + commands[2].options.key + 'load --table test_00000000000000000000000000 --values ' + commands[0].options.values, + 'load --table test_00000000000000000000000000 --values ' + commands[1].options.values, + 'delete --table test_00000000000000000000000000 --key ' + commands[2].options.key ].join('\n'); var stringified = Translator.commandsToString(commands); assert.equal(stringified, expected); Modified: test/database-domain.test.js (+3 -3) =================================================================== --- test/database-domain.test.js 2012-08-01 14:44:34 +0900 (9eb5fd6) +++ test/database-domain.test.js 2012-08-01 15:08:41 +0900 (fce8c2e) @@ -23,12 +23,12 @@ suite('database', function() { test('lower case', function() { var domain = new Domain('valid'); - assert.equal(domain.tableName, 'valid'); + assert.equal(domain.tableName, 'valid_00000000000000000000000000'); }); test('lower case and number', function() { var domain = new Domain('valid123'); - assert.equal(domain.tableName, 'valid123'); + assert.equal(domain.tableName, 'valid123_00000000000000000000000000'); }); test('too short', function() { @@ -64,7 +64,7 @@ suite('database', function() { test('termsTableName', function() { var domain = new Domain('valid123'); - assert.equal(domain.termsTableName, 'valid123_BigramTerms'); + assert.equal(domain.termsTableName, 'valid123_00000000000000000000000000_BigramTerms'); }); suite('from query parameter', function() { Modified: test/database-index-field.test.js (+4 -4) =================================================================== --- test/database-index-field.test.js 2012-08-01 14:44:34 +0900 (06c77a2) +++ test/database-index-field.test.js 2012-08-01 15:08:41 +0900 (c739656) @@ -5,7 +5,7 @@ var assert = require('chai').assert; var Domain = require('../lib/database/domain').Domain; var IndexField = require('../lib/database/index-field').IndexField; -suite('domain', function() { +suite('database', function() { suite('IndexField', function() { var domain; @@ -62,12 +62,12 @@ suite('domain', function() { test('indexColumnName', function() { var field = new IndexField('valid_123', domain); - assert.equal(field.indexColumnName, 'testdomain_valid_123'); + assert.equal(field.indexColumnName, 'testdomain_00000000000000000000000000_valid_123'); }); test('alterTableName', function() { var field = new IndexField('valid_123', domain); - assert.equal(field.alterTableName, 'testdomain_valid_123'); + assert.equal(field.alterTableName, 'testdomain_00000000000000000000000000_valid_123'); }); test('fieldTypeToColumnType (text)', function() { @@ -85,7 +85,7 @@ suite('domain', function() { test('fieldTypeToColumnType (literal)', function() { var field = new IndexField('valid_123', domain); assert.equal(field.fieldTypeToColumnType('literal'), - 'testdomain_valid_123'); + 'testdomain_00000000000000000000000000_valid_123'); }); test('initial status (text)', function() { Modified: test/fixture/companies/data-deleted.grn (+1 -1) =================================================================== --- test/fixture/companies/data-deleted.grn 2012-08-01 14:44:34 +0900 (e9d9feb) +++ test/fixture/companies/data-deleted.grn 2012-08-01 15:08:41 +0900 (f322e7c) @@ -1,4 +1,4 @@ -load --table companies +load --table companies_00000000000000000000000000 [ ["_key","address","age","description","email_address","name","product"], ["id2","Sapporo, Hokkaido, Japan",2,"","info****@enish*****","Enishi Tech Inc.","groonga"], Modified: test/fixture/companies/data.grn (+1 -1) =================================================================== --- test/fixture/companies/data.grn 2012-08-01 14:44:34 +0900 (8601714) +++ test/fixture/companies/data.grn 2012-08-01 15:08:41 +0900 (db92a18) @@ -1,4 +1,4 @@ -load --table companies +load --table companies_00000000000000000000000000 [ ["_key","address","age","description","email_address","name","product"], ["id1","Shibuya, Tokyo, Japan",1,"","info****@razil*****","Brazil","groonga"], Modified: test/fixture/companies/ddl.grn (+16 -16) =================================================================== --- test/fixture/companies/ddl.grn 2012-08-01 14:44:34 +0900 (c15d9c2) +++ test/fixture/companies/ddl.grn 2012-08-01 15:08:41 +0900 (0e6e518) @@ -1,16 +1,16 @@ -table_create companies_product TABLE_HASH_KEY ShortText -table_create companies_age TABLE_HASH_KEY UInt32 -table_create companies_BigramTerms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram -table_create companies TABLE_HASH_KEY ShortText -column_create companies address COLUMN_SCALAR ShortText -column_create companies age COLUMN_SCALAR UInt32 -column_create companies description COLUMN_SCALAR ShortText -column_create companies email_address COLUMN_SCALAR ShortText -column_create companies name COLUMN_SCALAR ShortText -column_create companies product COLUMN_SCALAR companies_product -column_create companies_BigramTerms companies_name COLUMN_INDEX|WITH_POSITION companies name -column_create companies_BigramTerms companies_email_address COLUMN_INDEX|WITH_POSITION companies email_address -column_create companies_BigramTerms companies_description COLUMN_INDEX|WITH_POSITION companies description -column_create companies_BigramTerms companies_address COLUMN_INDEX|WITH_POSITION companies address -column_create companies_age companies_age COLUMN_INDEX|WITH_POSITION companies age -column_create companies_product companies_product COLUMN_INDEX|WITH_POSITION companies product +table_create companies_00000000000000000000000000_product TABLE_HASH_KEY ShortText +table_create companies_00000000000000000000000000_age TABLE_HASH_KEY UInt32 +table_create companies_00000000000000000000000000_BigramTerms TABLE_PAT_KEY|KEY_NORMALIZE ShortText --default_tokenizer TokenBigram +table_create companies_00000000000000000000000000 TABLE_HASH_KEY ShortText +column_create companies_00000000000000000000000000 address COLUMN_SCALAR ShortText +column_create companies_00000000000000000000000000 age COLUMN_SCALAR UInt32 +column_create companies_00000000000000000000000000 description COLUMN_SCALAR ShortText +column_create companies_00000000000000000000000000 email_address COLUMN_SCALAR ShortText +column_create companies_00000000000000000000000000 name COLUMN_SCALAR ShortText +column_create companies_00000000000000000000000000 product COLUMN_SCALAR companies_00000000000000000000000000_product +column_create companies_00000000000000000000000000_BigramTerms companies_name COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 name +column_create companies_00000000000000000000000000_BigramTerms companies_email_address COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 email_address +column_create companies_00000000000000000000000000_BigramTerms companies_description COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 description +column_create companies_00000000000000000000000000_BigramTerms companies_address COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 address +column_create companies_00000000000000000000000000_age companies_age COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 age +column_create companies_00000000000000000000000000_product companies_product COLUMN_INDEX|WITH_POSITION companies_00000000000000000000000000 product Modified: test/fixture/companies/delete.grn (+1 -1) =================================================================== --- test/fixture/companies/delete.grn 2012-08-01 14:44:34 +0900 (1d336f7) +++ test/fixture/companies/delete.grn 2012-08-01 15:08:41 +0900 (231c8d8) @@ -1 +1 @@ -delete --table companies --key id1 +delete --table companies_00000000000000000000000000 --key id1 Modified: test/fixture/companies/synonyms.grn (+3 -3) =================================================================== --- test/fixture/companies/synonyms.grn 2012-08-01 14:44:34 +0900 (52adbb1) +++ test/fixture/companies/synonyms.grn 2012-08-01 15:08:41 +0900 (64220d0) @@ -1,6 +1,6 @@ -table_create companies_synonyms TABLE_HASH_KEY|KEY_NORMALIZE ShortText -column_create companies_synonyms synonyms COLUMN_VECTOR ShortText -load --table companies_synonyms +table_create companies_00000000000000000000000000_synonyms TABLE_HASH_KEY|KEY_NORMALIZE ShortText +column_create companies_00000000000000000000000000_synonyms synonyms COLUMN_VECTOR ShortText +load --table companies_00000000000000000000000000_synonyms [ ["_key","synonyms"], ["tokio",["tokyo"]], -------------- next part -------------- HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...Download