Kouhei Sutou
null+****@clear*****
Sun Dec 8 19:20:17 JST 2013
Kouhei Sutou 2013-12-08 19:20:17 +0900 (Sun, 08 Dec 2013) New Revision: 9c0af5314151b1e331a34bd0e29b648ae3e31df0 https://github.com/groonga/groonga/commit/9c0af5314151b1e331a34bd0e29b648ae3e31df0 Message: test: simplify data Modified files: test/command/suite/load/invalid/geo_point/not_break_following_text.expected test/command/suite/load/invalid/geo_point/not_break_following_text.test test/command/suite/load/invalid/geo_point/too_large_latitude.expected test/command/suite/load/invalid/geo_point/too_large_latitude.test test/command/suite/load/invalid/geo_point/too_large_longitude.expected test/command/suite/load/invalid/geo_point/too_large_longitude.test test/command/suite/load/invalid/geo_point/too_small_latitude.expected test/command/suite/load/invalid/geo_point/too_small_latitude.test test/command/suite/load/invalid/geo_point/too_small_longitude.expected test/command/suite/load/invalid/geo_point/too_small_longitude.test Modified: test/command/suite/load/invalid/geo_point/not_break_following_text.expected (+14 -14) =================================================================== --- test/command/suite/load/invalid/geo_point/not_break_following_text.expected 2013-12-08 18:44:35 +0900 (5892adc) +++ test/command/suite/load/invalid/geo_point/not_break_following_text.expected 2013-12-08 19:20:17 +0900 (8c4c020) @@ -1,10 +1,10 @@ -table_create Shops TABLE_HASH_KEY ShortText +table_create LandMarks TABLE_HASH_KEY ShortText [[0,0.0,0.0],true] -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint [[0,0.0,0.0],true] -column_create Shops code COLUMN_SCALAR ShortText +column_create LandMarks code COLUMN_SCALAR ShortText [[0,0.0,0.0],true] -load --table Shops +load --table LandMarks [ {"_key":"a","location":"x","code":"a0000000"}, {"_key":"b","location":"x","code":"b0000000"}, @@ -16,14 +16,14 @@ load --table Shops {"_key":"b","location":"x","code":"b0000006"} ] [[0,0.0,0.0],8] -#|e| <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"a">, column: <location>, value: <"x"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> -select Shops --filter 'code == "a0000000"' --output_columns _key +#|e| <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"a">, column: <location>, value: <"x"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"x">: key: <"b">, column: <location>, value: <"x"> +select LandMarks --filter 'code == "a0000000"' --output_columns _key [[0,0.0,0.0],[[[1],[["_key","ShortText"]],["a"]]]] Modified: test/command/suite/load/invalid/geo_point/not_break_following_text.test (+5 -5) =================================================================== --- test/command/suite/load/invalid/geo_point/not_break_following_text.test 2013-12-08 18:44:35 +0900 (0986737) +++ test/command/suite/load/invalid/geo_point/not_break_following_text.test 2013-12-08 19:20:17 +0900 (7920a82) @@ -1,8 +1,8 @@ -table_create Shops TABLE_HASH_KEY ShortText -column_create Shops location COLUMN_SCALAR WGS84GeoPoint -column_create Shops code COLUMN_SCALAR ShortText +table_create LandMarks TABLE_HASH_KEY ShortText +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint +column_create LandMarks code COLUMN_SCALAR ShortText -load --table Shops +load --table LandMarks [ {"_key":"a","location":"x","code":"a0000000"}, {"_key":"b","location":"x","code":"b0000000"}, @@ -14,4 +14,4 @@ load --table Shops {"_key":"b","location":"x","code":"b0000006"} ] -select Shops --filter 'code == "a0000000"' --output_columns _key +select LandMarks --filter 'code == "a0000000"' --output_columns _key Modified: test/command/suite/load/invalid/geo_point/too_large_latitude.expected (+8 -40) =================================================================== --- test/command/suite/load/invalid/geo_point/too_large_latitude.expected 2013-12-08 18:44:35 +0900 (8da95fc) +++ test/command/suite/load/invalid/geo_point/too_large_latitude.expected 2013-12-08 19:20:17 +0900 (9bf6e8a) @@ -1,45 +1,13 @@ -table_create Shops TABLE_HASH_KEY ShortText +table_create LandMarks TABLE_NO_KEY [[0,0.0,0.0],true] -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint [[0,0.0,0.0],true] -load --table Shops +load --table LandMarks [ -{"_key": "Statue of Liberty", "location": "324000001x-74.044444"} +{"location": "324000001x1"} ] [[0,0.0,0.0],1] -#|e| <Shops.location>: failed to cast to <WGS84GeoPoint>: <"324000001x-74.044444"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"324000001x-74.044444">: key: <"Statue of Liberty">, column: <location>, value: <"324000001x-74.044444"> -select Shops -[ - [ - 0, - 0.0, - 0.0 - ], - [ - [ - [ - 1 - ], - [ - [ - "_id", - "UInt32" - ], - [ - "_key", - "ShortText" - ], - [ - "location", - "WGS84GeoPoint" - ] - ], - [ - 1, - "Statue of Liberty", - "0x0" - ] - ] - ] -] +#|e| <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"324000001x1"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"324000001x1">: key: <(NULL)>, column: <location>, value: <"324000001x1"> +select LandMarks +[[0,0.0,0.0],[[[1],[["_id","UInt32"],["location","WGS84GeoPoint"]],[1,"0x0"]]]] Modified: test/command/suite/load/invalid/geo_point/too_large_latitude.test (+5 -5) =================================================================== --- test/command/suite/load/invalid/geo_point/too_large_latitude.test 2013-12-08 18:44:35 +0900 (b524d42) +++ test/command/suite/load/invalid/geo_point/too_large_latitude.test 2013-12-08 19:20:17 +0900 (59e2b7c) @@ -1,9 +1,9 @@ -table_create Shops TABLE_HASH_KEY ShortText -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +table_create LandMarks TABLE_NO_KEY +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint -load --table Shops +load --table LandMarks [ -{"_key": "Statue of Liberty", "location": "324000001x-74.044444"} +{"location": "324000001x1"} ] -select Shops +select LandMarks Modified: test/command/suite/load/invalid/geo_point/too_large_longitude.expected (+8 -40) =================================================================== --- test/command/suite/load/invalid/geo_point/too_large_longitude.expected 2013-12-08 18:44:35 +0900 (77c4e06) +++ test/command/suite/load/invalid/geo_point/too_large_longitude.expected 2013-12-08 19:20:17 +0900 (692ff6e) @@ -1,45 +1,13 @@ -table_create Shops TABLE_HASH_KEY ShortText +table_create LandMarks TABLE_NO_KEY [[0,0.0,0.0],true] -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint [[0,0.0,0.0],true] -load --table Shops +load --table LandMarks [ -{"_key": "Statue of Liberty", "location": "40.689167x648000001"} +{"location": "1x648000001"} ] [[0,0.0,0.0],1] -#|e| <Shops.location>: failed to cast to <WGS84GeoPoint>: <"40.689167x648000001"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"40.689167x648000001">: key: <"Statue of Liberty">, column: <location>, value: <"40.689167x648000001"> -select Shops -[ - [ - 0, - 0.0, - 0.0 - ], - [ - [ - [ - 1 - ], - [ - [ - "_id", - "UInt32" - ], - [ - "_key", - "ShortText" - ], - [ - "location", - "WGS84GeoPoint" - ] - ], - [ - 1, - "Statue of Liberty", - "0x0" - ] - ] - ] -] +#|e| <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"1x648000001"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"1x648000001">: key: <(NULL)>, column: <location>, value: <"1x648000001"> +select LandMarks +[[0,0.0,0.0],[[[1],[["_id","UInt32"],["location","WGS84GeoPoint"]],[1,"0x0"]]]] Modified: test/command/suite/load/invalid/geo_point/too_large_longitude.test (+5 -5) =================================================================== --- test/command/suite/load/invalid/geo_point/too_large_longitude.test 2013-12-08 18:44:35 +0900 (fe6b242) +++ test/command/suite/load/invalid/geo_point/too_large_longitude.test 2013-12-08 19:20:17 +0900 (55a5edc) @@ -1,9 +1,9 @@ -table_create Shops TABLE_HASH_KEY ShortText -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +table_create LandMarks TABLE_NO_KEY +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint -load --table Shops +load --table LandMarks [ -{"_key": "Statue of Liberty", "location": "40.689167x648000001"} +{"location": "1x648000001"} ] -select Shops +select LandMarks Modified: test/command/suite/load/invalid/geo_point/too_small_latitude.expected (+8 -40) =================================================================== --- test/command/suite/load/invalid/geo_point/too_small_latitude.expected 2013-12-08 18:44:35 +0900 (e4458f5) +++ test/command/suite/load/invalid/geo_point/too_small_latitude.expected 2013-12-08 19:20:17 +0900 (6e9d5c1) @@ -1,45 +1,13 @@ -table_create Shops TABLE_HASH_KEY ShortText +table_create LandMarks TABLE_NO_KEY [[0,0.0,0.0],true] -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint [[0,0.0,0.0],true] -load --table Shops +load --table LandMarks [ -{"_key": "Statue of Liberty", "location": "-324000001x-74.044444"} +{"location": "-324000001x1"} ] [[0,0.0,0.0],1] -#|e| <Shops.location>: failed to cast to <WGS84GeoPoint>: <"-324000001x-74.044444"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"-324000001x-74.044444">: key: <"Statue of Liberty">, column: <location>, value: <"-324000001x-74.044444"> -select Shops -[ - [ - 0, - 0.0, - 0.0 - ], - [ - [ - [ - 1 - ], - [ - [ - "_id", - "UInt32" - ], - [ - "_key", - "ShortText" - ], - [ - "location", - "WGS84GeoPoint" - ] - ], - [ - 1, - "Statue of Liberty", - "0x0" - ] - ] - ] -] +#|e| <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"-324000001x1"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"-324000001x1">: key: <(NULL)>, column: <location>, value: <"-324000001x1"> +select LandMarks +[[0,0.0,0.0],[[[1],[["_id","UInt32"],["location","WGS84GeoPoint"]],[1,"0x0"]]]] Modified: test/command/suite/load/invalid/geo_point/too_small_latitude.test (+5 -5) =================================================================== --- test/command/suite/load/invalid/geo_point/too_small_latitude.test 2013-12-08 18:44:35 +0900 (4d05f6f) +++ test/command/suite/load/invalid/geo_point/too_small_latitude.test 2013-12-08 19:20:17 +0900 (3e13681) @@ -1,9 +1,9 @@ -table_create Shops TABLE_HASH_KEY ShortText -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +table_create LandMarks TABLE_NO_KEY +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint -load --table Shops +load --table LandMarks [ -{"_key": "Statue of Liberty", "location": "-324000001x-74.044444"} +{"location": "-324000001x1"} ] -select Shops +select LandMarks Modified: test/command/suite/load/invalid/geo_point/too_small_longitude.expected (+8 -40) =================================================================== --- test/command/suite/load/invalid/geo_point/too_small_longitude.expected 2013-12-08 18:44:35 +0900 (7c8e67c) +++ test/command/suite/load/invalid/geo_point/too_small_longitude.expected 2013-12-08 19:20:17 +0900 (c036851) @@ -1,45 +1,13 @@ -table_create Shops TABLE_HASH_KEY ShortText +table_create LandMarks TABLE_NO_KEY [[0,0.0,0.0],true] -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint [[0,0.0,0.0],true] -load --table Shops +load --table LandMarks [ -{"_key": "Statue of Liberty", "location": "40.689167x-648000001"} +{"location": "1x-648000001"} ] [[0,0.0,0.0],1] -#|e| <Shops.location>: failed to cast to <WGS84GeoPoint>: <"40.689167x-648000001"> -#|e| [table][load] failed to set column value: <Shops.location>: failed to cast to <WGS84GeoPoint>: <"40.689167x-648000001">: key: <"Statue of Liberty">, column: <location>, value: <"40.689167x-648000001"> -select Shops -[ - [ - 0, - 0.0, - 0.0 - ], - [ - [ - [ - 1 - ], - [ - [ - "_id", - "UInt32" - ], - [ - "_key", - "ShortText" - ], - [ - "location", - "WGS84GeoPoint" - ] - ], - [ - 1, - "Statue of Liberty", - "0x0" - ] - ] - ] -] +#|e| <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"1x-648000001"> +#|e| [table][load] failed to set column value: <LandMarks.location>: failed to cast to <WGS84GeoPoint>: <"1x-648000001">: key: <(NULL)>, column: <location>, value: <"1x-648000001"> +select LandMarks +[[0,0.0,0.0],[[[1],[["_id","UInt32"],["location","WGS84GeoPoint"]],[1,"0x0"]]]] Modified: test/command/suite/load/invalid/geo_point/too_small_longitude.test (+5 -5) =================================================================== --- test/command/suite/load/invalid/geo_point/too_small_longitude.test 2013-12-08 18:44:35 +0900 (c29b91d) +++ test/command/suite/load/invalid/geo_point/too_small_longitude.test 2013-12-08 19:20:17 +0900 (10440ef) @@ -1,9 +1,9 @@ -table_create Shops TABLE_HASH_KEY ShortText -column_create Shops location COLUMN_SCALAR WGS84GeoPoint +table_create LandMarks TABLE_NO_KEY +column_create LandMarks location COLUMN_SCALAR WGS84GeoPoint -load --table Shops +load --table LandMarks [ -{"_key": "Statue of Liberty", "location": "40.689167x-648000001"} +{"location": "1x-648000001"} ] -select Shops +select LandMarks -------------- next part -------------- HTML����������������������������...Download