cartodb4/observatory-extension
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add test that takes out the geom component

Browse Source
This commit is contained in:
John Krauss 2016-12-12 21:49:00 +00:00
parent d4e6e7ac95
commit d17b865648
1 changed files with 59 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/python/test/perftest.py
View File

@ -79,10 +79,10 @@ for q in (
ARGS = { ARGS = {
('OBS_GetMeasureByID', None): "name, 'us.census.acs.B01001002', '{}'", ('OBS_GetMeasureByID', None): "name, 'us.census.acs.B01001002', '{}'",
('OBS_GetMeasure', 'predenominated'): "{}, 'us.census.acs.B01003001'", ('OBS_GetMeasure', 'predenominated'): "{}, 'us.census.acs.B01003001', NULL, {}",
('OBS_GetMeasure', 'area'): "{}, 'us.census.acs.B01001002', 'area'", ('OBS_GetMeasure', 'area'): "{}, 'us.census.acs.B01001002', 'area', {}",
('OBS_GetMeasure', 'denominator'): "{}, 'us.census.acs.B01001002', 'denominator'", ('OBS_GetMeasure', 'denominator'): "{}, 'us.census.acs.B01001002', 'denominator', {}",
('OBS_GetCategory', None): "{}, 'us.census.spielman_singleton_segments.X10'", ('OBS_GetCategory', None): "{}, 'us.census.spielman_singleton_segments.X10', {}",
('_OBS_GetGeometryScores', None): "{}, NULL" ('_OBS_GetGeometryScores', None): "{}, NULL"
} }
@ -153,37 +153,63 @@ def test_getgeometryscores_performance(geom_complexity, api_method, filters, tar
}, results) }, results)
@parameterized([ @parameterized([
('simple', 'OBS_GetMeasureByID', None, 'us.census.tiger.census_tract'), ('simple', 'OBS_GetMeasureByID', None, 'us.census.tiger.census_tract', None),
('complex', 'OBS_GetMeasureByID', None, 'us.census.tiger.county'), ('complex', 'OBS_GetMeasureByID', None, 'us.census.tiger.county', None),
('simple', 'OBS_GetMeasure', 'predenominated', 'point'), ('simple', 'OBS_GetMeasure', 'predenominated', 'point', None),
('simple', 'OBS_GetMeasure', 'predenominated', 'geom'), ('simple', 'OBS_GetMeasure', 'predenominated', 'geom', None),
('simple', 'OBS_GetMeasure', 'predenominated', 'offset_geom'), ('simple', 'OBS_GetMeasure', 'predenominated', 'offset_geom', None),
('simple', 'OBS_GetMeasure', 'area', 'point'), ('simple', 'OBS_GetMeasure', 'area', 'point', None),
('simple', 'OBS_GetMeasure', 'area', 'geom'), ('simple', 'OBS_GetMeasure', 'area', 'geom', None),
('simple', 'OBS_GetMeasure', 'area', 'offset_geom'), ('simple', 'OBS_GetMeasure', 'area', 'offset_geom', None),
('simple', 'OBS_GetMeasure', 'denominator', 'point'), ('simple', 'OBS_GetMeasure', 'denominator', 'point', None),
('simple', 'OBS_GetMeasure', 'denominator', 'geom'), ('simple', 'OBS_GetMeasure', 'denominator', 'geom', None),
('simple', 'OBS_GetMeasure', 'denominator', 'offset_geom'), ('simple', 'OBS_GetMeasure', 'denominator', 'offset_geom', None),
('simple', 'OBS_GetCategory', None, 'point'), ('simple', 'OBS_GetCategory', None, 'point', None),
('simple', 'OBS_GetCategory', None, 'geom'), ('simple', 'OBS_GetCategory', None, 'geom', None),
('simple', 'OBS_GetCategory', None, 'offset_geom'), ('simple', 'OBS_GetCategory', None, 'offset_geom', None),
('complex', 'OBS_GetMeasure', 'predenominated', 'point'), ('simple', 'OBS_GetMeasure', 'predenominated', 'point', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'predenominated', 'geom'), ('simple', 'OBS_GetMeasure', 'predenominated', 'geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'predenominated', 'offset_geom'), ('simple', 'OBS_GetMeasure', 'predenominated', 'offset_geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'area', 'point'), ('simple', 'OBS_GetMeasure', 'area', 'point', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'area', 'geom'), ('simple', 'OBS_GetMeasure', 'area', 'geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'area', 'offset_geom'), ('simple', 'OBS_GetMeasure', 'area', 'offset_geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'denominator', 'point'), ('simple', 'OBS_GetMeasure', 'denominator', 'point', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'denominator', 'geom'), ('simple', 'OBS_GetMeasure', 'denominator', 'geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'denominator', 'offset_geom'), ('simple', 'OBS_GetMeasure', 'denominator', 'offset_geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetCategory', None, 'point'), ('simple', 'OBS_GetCategory', None, 'point', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetCategory', None, 'geom'), ('simple', 'OBS_GetCategory', None, 'geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetCategory', None, 'offset_geom'), ('simple', 'OBS_GetCategory', None, 'offset_geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetMeasure', 'predenominated', 'point', None),
('complex', 'OBS_GetMeasure', 'predenominated', 'geom', None),
('complex', 'OBS_GetMeasure', 'predenominated', 'offset_geom', None),
('complex', 'OBS_GetMeasure', 'area', 'point', None),
('complex', 'OBS_GetMeasure', 'area', 'geom', None),
('complex', 'OBS_GetMeasure', 'area', 'offset_geom', None),
('complex', 'OBS_GetMeasure', 'denominator', 'point', None),
('complex', 'OBS_GetMeasure', 'denominator', 'geom', None),
('complex', 'OBS_GetMeasure', 'denominator', 'offset_geom', None),
('complex', 'OBS_GetCategory', None, 'point', None),
('complex', 'OBS_GetCategory', None, 'geom', None),
('complex', 'OBS_GetCategory', None, 'offset_geom', None),
('complex', 'OBS_GetMeasure', 'predenominated', 'point', "'us.census.tiger.county'"),
('complex', 'OBS_GetMeasure', 'predenominated', 'geom', "'us.census.tiger.county'"),
('complex', 'OBS_GetMeasure', 'predenominated', 'offset_geom', "'us.census.tiger.county'"),
('complex', 'OBS_GetMeasure', 'area', 'point', "'us.census.tiger.county'"),
('complex', 'OBS_GetMeasure', 'area', 'geom', "'us.census.tiger.county'"),
('complex', 'OBS_GetMeasure', 'area', 'offset_geom', "'us.census.tiger.county'"),
('complex', 'OBS_GetMeasure', 'denominator', 'point', "'us.census.tiger.county'"),
('complex', 'OBS_GetMeasure', 'denominator', 'geom', "'us.census.tiger.county'"),
('complex', 'OBS_GetMeasure', 'denominator', 'offset_geom', "'us.census.tiger.county'"),
('complex', 'OBS_GetCategory', None, 'point', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetCategory', None, 'geom', "'us.census.tiger.census_tract'"),
('complex', 'OBS_GetCategory', None, 'offset_geom', "'us.census.tiger.census_tract'"),
]) ])
def test_getmeasure_performance(geom_complexity, api_method, normalization, geom): def test_getmeasure_performance(geom_complexity, api_method, normalization, geom, boundary):
print api_method, geom_complexity, normalization, geom print api_method, geom_complexity, normalization, geom, boundary
col = 'measure' if 'measure' in api_method.lower() else 'category' col = 'measure' if 'measure' in api_method.lower() else 'category'
results = [] results = []
@ -196,7 +222,7 @@ def test_getmeasure_performance(geom_complexity, api_method, normalization, geom
complexity=geom_complexity, complexity=geom_complexity,
schema='cdb_observatory.' if USE_SCHEMA else '', schema='cdb_observatory.' if USE_SCHEMA else '',
api_method=api_method, api_method=api_method,
args=ARGS[api_method, normalization].format(geom), args=ARGS[api_method, normalization].format(geom, boundary),
n=rows+1) n=rows+1)
start = time() start = time()
query(stmt) query(stmt)