Merge branch 'more-perf' into develop

* more-perf:
  Add more perf tests
  Add deeply nested projection perf test
  Move cases into their own directory

Author: jamesls

perf/basic.json renamed to perf/cases/basic.json

@@ -11,7 +11,7 @@
          {
             "name": "deep_nesting_50",
             "expression": "j49.j48.j47.j46.j45.j44.j43.j42.j41.j40.j39.j38.j37.j36.j35.j34.j33.j32.j31.j30.j29.j28.j27.j26.j25.j24.j23.j22.j21.j20.j19.j18.j17.j16.j15.j14.j13.j12.j11.j10.j9.j8.j7.j6.j5.j4.j3.j2.j1.j0",
-            "result": []
+            "result": {}
          },
          {
             "name": "deep_nesting_50_pipe",

perf/deep_hierarchy.json renamed to perf/cases/deep_hierarchy.json

@@ -0,0 +1,13 @@
+{
+    "description": "Deep projections",
+    "given":
+        {"a": []},
+     "cases": [
+         {
+            "name": "deep_projection_104",
+            "expression": "a[*].b[*].c[*].d[*].e[*].f[*].g[*].h[*].i[*].j[*].k[*].l[*].m[*].n[*].o[*].p[*].q[*].r[*].s[*].t[*].u[*].v[*].w[*].x[*].y[*].z[*].a[*].b[*].c[*].d[*].e[*].f[*].g[*].h[*].i[*].j[*].k[*].l[*].m[*].n[*].o[*].p[*].q[*].r[*].s[*].t[*].u[*].v[*].w[*].x[*].y[*].z[*].a[*].b[*].c[*].d[*].e[*].f[*].g[*].h[*].i[*].j[*].k[*].l[*].m[*].n[*].o[*].p[*].q[*].r[*].s[*].t[*].u[*].v[*].w[*].x[*].y[*].z[*].a[*].b[*].c[*].d[*].e[*].f[*].g[*].h[*].i[*].j[*].k[*].l[*].m[*].n[*].o[*].p[*].q[*].r[*].s[*].t[*].u[*].v[*].w[*].x[*].y[*].z[*]",
+            "result": []
+         }
+     ]
+}
+

perf/cases/deep_projection.json

@@ -0,0 +1,18 @@
+{
+    "description": "Deep projections",
+    "given":
+      [749, 222, 102, 148, 869, 848, 326, 644, 402, 150, 361, 827, 741, 60, 842, 943, 214, 519, 134, 866, 621, 851, 59, 580, 760, 576, 951, 989, 266, 259, 809, 643, 292, 731, 129, 970, 589, 430, 690, 715, 901, 491, 276, 88, 738, 282, 547, 349, 236, 879, 403, 557, 554, 23, 649, 720, 531, 2, 601, 152, 530, 477, 568, 122, 811, 75, 181, 203, 683, 152, 794, 155, 54, 314, 957, 468, 740, 532, 504, 806, 927, 827, 840, 100, 519, 357, 536, 398, 417, 543, 599, 383, 144, 772, 988, 184, 118, 921, 497, 193, 320, 919, 583, 346, 575, 143, 866, 907, 570, 255, 539, 164, 764, 256, 315, 305, 960, 587, 804, 577, 667, 869, 563, 956, 677, 469, 934, 52, 323, 933, 398, 305, 138, 133, 443, 419, 717, 838, 287, 177, 192, 210, 892, 319, 470, 76, 643, 737, 135, 425, 586, 882, 844, 113, 268, 323, 938, 569, 374, 295, 648, 27, 703, 530, 667, 118, 176, 972, 611, 60, 47, 19, 500, 344, 332, 452, 647, 388, 188, 235, 151, 353, 219, 766, 626, 885, 456, 182, 363, 617, 236, 285, 152, 87, 666, 429, 599, 762, 13, 778, 634, 43, 199, 361, 300, 370, 957, 488, 359, 354, 972, 368, 482, 88, 766, 709, 804, 637, 368, 950, 752, 932, 638, 291, 177, 739, 740, 357, 928, 964, 621, 472, 813, 36, 271, 642, 3, 771, 397, 670, 324, 244, 827, 194, 693, 846, 351, 668, 911, 600, 682, 735, 26, 876, 581, 915, 184, 263, 857, 960, 5, 523, 932, 694, 457, 739, 897, 28, 794, 885, 77, 768, 39, 763, 748, 792, 60, 582, 667, 909, 820, 898, 569, 252, 583, 237, 677, 613, 914, 956, 541, 297, 853, 581, 118, 888, 368, 156, 582, 183],
+     "cases": [
+         {
+            "name": "min sort with slice",
+            "expression": "sort(@)[:3]",
+            "result": [2, 3, 5]
+         },
+         {
+            "name": "max sort with slice",
+            "expression": "sort(@)[-3:]",
+            "result": [972, 988, 989]
+         }
+     ]
+}
+

perf/cases/functions.json

@@ -23,19 +23,20 @@
 from jmespath.lexer import Lexer
 
 
-DIRECTORY = os.path.join(os.path.dirname(os.path.abspath(__file__)))
-DEFAULT_NUM_LOOP = 1000
+DIRECTORY = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'cases')
+DEFAULT_NUM_LOOP = 100
 
 
 def run_tests(tests):
     times = []
     for test in tests:
         given = test['given']
         expression = test['expression']
+        result = test['result']
         lex_time = _lex_time(expression)
         parse_time = _parse_time(expression)
         search_time = _search_time(expression, given)
-        combined_time = _combined_time(expression, given)
+        combined_time = _combined_time(expression, given, result)
         sys.stdout.write(
             "lex_time: %.5fms, parse_time: %.5fms, search_time: %.5fms "
             "combined_time: %.5fms " % (1000 * lex_time,
@@ -86,15 +87,18 @@ def _parse_time(expression, clock=_clock):
     return best
 
 
-def _combined_time(expression, given, clock=_clock):
+def _combined_time(expression, given, result, clock=_clock):
     best = float('inf')
     p = Parser()
     for i in range(DEFAULT_NUM_LOOP):
         p.purge()
         start = clock()
-        p.parse(expression).search(given)
+        r = p.parse(expression).search(given)
         end = clock()
         total = end - start
+        if r != result:
+            raise RuntimeError("Unexpected result, received: %s, "
+                               "expected: %s" % (r, result))
         if total < best:
             best = total
     return best