Kouhei Sutou
null+****@clear*****
Sun Feb 15 12:23:48 JST 2015
Kouhei Sutou 2015-02-15 12:23:48 +0900 (Sun, 15 Feb 2015) New Revision: 09cc05576b0736663656c5e6953b22d6078c3663 https://github.com/pgroonga/pgroonga/commit/09cc05576b0736663656c5e6953b22d6078c3663 Message: Update validation Modified files: expected/compare/varchar/single/equal/bitmapscan.out expected/compare/varchar/single/equal/indexscan.out expected/compare/varchar/single/equal/seqscan.out pgroonga.c sql/compare/varchar/single/equal/bitmapscan.sql sql/compare/varchar/single/equal/indexscan.sql sql/compare/varchar/single/equal/seqscan.sql Modified: expected/compare/varchar/single/equal/bitmapscan.out (+1 -1) =================================================================== --- expected/compare/varchar/single/equal/bitmapscan.out 2015-02-15 12:21:16 +0900 (775f1f6) +++ expected/compare/varchar/single/equal/bitmapscan.out 2015-02-15 12:23:48 +0900 (5e72ae5) @@ -1,6 +1,6 @@ CREATE TABLE memos ( id integer, - title varchar(4096) + title varchar(1023) ); INSERT INTO memos VALUES (1, 'PostgreSQL'); INSERT INTO memos VALUES (2, 'Groonga'); Modified: expected/compare/varchar/single/equal/indexscan.out (+1 -1) =================================================================== --- expected/compare/varchar/single/equal/indexscan.out 2015-02-15 12:21:16 +0900 (149f9f7) +++ expected/compare/varchar/single/equal/indexscan.out 2015-02-15 12:23:48 +0900 (5438752) @@ -1,6 +1,6 @@ CREATE TABLE memos ( id integer, - title text + title varchar(1023) ); INSERT INTO memos VALUES (1, 'PostgreSQL'); INSERT INTO memos VALUES (2, 'Groonga'); Modified: expected/compare/varchar/single/equal/seqscan.out (+1 -1) =================================================================== --- expected/compare/varchar/single/equal/seqscan.out 2015-02-15 12:21:16 +0900 (ed2db2f) +++ expected/compare/varchar/single/equal/seqscan.out 2015-02-15 12:23:48 +0900 (703b743) @@ -1,6 +1,6 @@ CREATE TABLE memos ( id integer, - title text + title varchar(1023) ); INSERT INTO memos VALUES (1, 'PostgreSQL'); INSERT INTO memos VALUES (2, 'Groonga'); Modified: pgroonga.c (+14 -10) =================================================================== --- pgroonga.c 2015-02-15 12:21:16 +0900 (0ff351f) +++ pgroonga.c 2015-02-15 12:23:48 +0900 (c3f4456) @@ -408,19 +408,23 @@ PGrnGetType(Relation index, AttrNumber n, unsigned char *flags) typeID = GRN_DB_LONG_TEXT; break; case VARCHAROID: - typeID = GRN_DB_LONG_TEXT; maxlen = type_maximum_size(attr->atttypid, attr->atttypmod); - if (maxlen >= 0) + if (maxlen < 0) { - if (maxlen < 4096) - { - typeID = GRN_DB_SHORT_TEXT; /* 4KB */ - } - else if (maxlen < 64 * 1024) - { - typeID = GRN_DB_TEXT; /* 64KB */ - } + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("pgroonga: " + "use text instead of unlimited size varchar"))); + } + if (maxlen > 4096) + { + ereport(ERROR, + (errcode(ERRCODE_FEATURE_NOT_SUPPORTED), + errmsg("pgroonga: " + "4097bytes over size varchar isn't supported: %d", + maxlen))); } + typeID = GRN_DB_SHORT_TEXT; /* 4KB */ break; #ifdef NOT_USED case POINTOID: Modified: sql/compare/varchar/single/equal/bitmapscan.sql (+1 -1) =================================================================== --- sql/compare/varchar/single/equal/bitmapscan.sql 2015-02-15 12:21:16 +0900 (06e2eac) +++ sql/compare/varchar/single/equal/bitmapscan.sql 2015-02-15 12:23:48 +0900 (ea2f81e) @@ -1,6 +1,6 @@ CREATE TABLE memos ( id integer, - title varchar(4096) + title varchar(1023) ); INSERT INTO memos VALUES (1, 'PostgreSQL'); Modified: sql/compare/varchar/single/equal/indexscan.sql (+1 -1) =================================================================== --- sql/compare/varchar/single/equal/indexscan.sql 2015-02-15 12:21:16 +0900 (805e312) +++ sql/compare/varchar/single/equal/indexscan.sql 2015-02-15 12:23:48 +0900 (8088bd3) @@ -1,6 +1,6 @@ CREATE TABLE memos ( id integer, - title text + title varchar(1023) ); INSERT INTO memos VALUES (1, 'PostgreSQL'); Modified: sql/compare/varchar/single/equal/seqscan.sql (+1 -1) =================================================================== --- sql/compare/varchar/single/equal/seqscan.sql 2015-02-15 12:21:16 +0900 (f2143a0) +++ sql/compare/varchar/single/equal/seqscan.sql 2015-02-15 12:23:48 +0900 (ebe1d9f) @@ -1,6 +1,6 @@ CREATE TABLE memos ( id integer, - title text + title varchar(1023) ); INSERT INTO memos VALUES (1, 'PostgreSQL'); -------------- next part -------------- HTML����������������������������...Download