You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/05/03 13:56:27 UTC
[34/50] [abbrv] tinkerpop git commit: TINKERPOP-1010 Remove
deprecated methods around Gremlin Server
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-benchmark/benchmarks/GraphMutateBenchmark-20170328120631.json
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/benchmarks/GraphMutateBenchmark-20170328120631.json b/gremlin-benchmark/benchmarks/GraphMutateBenchmark-20170328120631.json
new file mode 100644
index 0000000..53f2484
--- /dev/null
+++ b/gremlin-benchmark/benchmarks/GraphMutateBenchmark-20170328120631.json
@@ -0,0 +1,723 @@
+[
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testAddE",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 18568.560012525682,
+ "scoreError" : 1364.9645340322086,
+ "scoreConfidence" : [
+ 17203.595478493473,
+ 19933.524546557892
+ ],
+ "scorePercentiles" : {
+ "0.0" : 15612.876565402203,
+ "50.0" : 19603.533707515133,
+ "90.0" : 20122.34027479781,
+ "95.0" : 20382.944697566665,
+ "99.0" : 20396.373426582522,
+ "99.9" : 20396.373426582522,
+ "99.99" : 20396.373426582522,
+ "99.999" : 20396.373426582522,
+ "99.9999" : 20396.373426582522,
+ "100.0" : 20396.373426582522
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 19730.224282378902,
+ 15612.876565402203,
+ 17195.907745939407,
+ 17600.586264388854,
+ 16696.08578564136,
+ 17085.058946185472,
+ 16946.547326852924,
+ 17111.558478220923,
+ 17075.27983024661,
+ 17040.549032578045
+ ],
+ [
+ 20396.373426582522,
+ 19506.766875815076,
+ 20127.798846265385,
+ 19700.300539215194,
+ 19920.352127809314,
+ 19870.83636179113,
+ 20073.213131589655,
+ 19973.453146510998,
+ 19945.159259495867,
+ 19762.272277603854
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testAddEdge",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 3545827.8128708913,
+ "scoreError" : 164188.68182893115,
+ "scoreConfidence" : [
+ 3381639.1310419603,
+ 3710016.4946998223
+ ],
+ "scorePercentiles" : {
+ "0.0" : 3147396.0860687103,
+ "50.0" : 3560398.5216154563,
+ "90.0" : 3784689.618538405,
+ "95.0" : 3799173.8504434866,
+ "99.0" : 3799920.2055028495,
+ "99.9" : 3799920.2055028495,
+ "99.99" : 3799920.2055028495,
+ "99.999" : 3799920.2055028495,
+ "99.9999" : 3799920.2055028495,
+ "100.0" : 3799920.2055028495
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 3567420.202278764,
+ 3499680.787595466,
+ 3147396.0860687103,
+ 3617049.2435972164,
+ 3360757.7049386296,
+ 3481734.431501484,
+ 3639444.6956460006,
+ 3553376.8409521487,
+ 3516064.110489793,
+ 3705075.868381011
+ ],
+ [
+ 3211137.3847159045,
+ 3305237.826017959,
+ 3367663.551160614,
+ 3533974.274073548,
+ 3730573.400708911,
+ 3781958.246543721,
+ 3784993.104315592,
+ 3799920.2055028495,
+ 3683725.1873092595,
+ 3629373.1056202366
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testAddV",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 301781.73767278256,
+ "scoreError" : 5651.1784742015,
+ "scoreConfidence" : [
+ 296130.5591985811,
+ 307432.91614698403
+ ],
+ "scorePercentiles" : {
+ "0.0" : 285604.1477020154,
+ "50.0" : 302922.3325909928,
+ "90.0" : 310081.0161328199,
+ "95.0" : 310269.17259478266,
+ "99.0" : 310273.7706193354,
+ "99.9" : 310273.7706193354,
+ "99.99" : 310273.7706193354,
+ "99.999" : 310273.7706193354,
+ "99.9999" : 310273.7706193354,
+ "100.0" : 310273.7706193354
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 309173.8701736787,
+ 304717.01764288463,
+ 301931.76299133454,
+ 303163.526517191,
+ 303275.12533305434,
+ 308064.8586756789,
+ 310181.81012828,
+ 306335.689716478,
+ 299824.44007446,
+ 310273.7706193354
+ ],
+ [
+ 298199.8889342871,
+ 300967.62688004377,
+ 298445.0289998472,
+ 296829.33708138205,
+ 295407.7796844424,
+ 302681.13866479456,
+ 305073.25683884067,
+ 305951.7470435136,
+ 289532.9297541101,
+ 285604.1477020154
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testAddVAddEWithPropsChained",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 5.358249771903094,
+ "scoreError" : 0.10537602387243872,
+ "scoreConfidence" : [
+ 5.252873748030655,
+ 5.463625795775533
+ ],
+ "scorePercentiles" : {
+ "0.0" : 5.081125602819131,
+ "50.0" : 5.366277070192795,
+ "90.0" : 5.509210576516796,
+ "95.0" : 5.528652109034099,
+ "99.0" : 5.529639374854436,
+ "99.9" : 5.529639374854436,
+ "99.99" : 5.529639374854436,
+ "99.999" : 5.529639374854436,
+ "99.9999" : 5.529639374854436,
+ "100.0" : 5.529639374854436
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 5.320610679617369,
+ 5.081125602819131,
+ 5.336728996746902,
+ 5.29142365410353,
+ 5.503059239138573,
+ 5.387604004597437,
+ 5.497843818500814,
+ 5.3930022726893565,
+ 5.529639374854436,
+ 5.401333899376322
+ ],
+ [
+ 5.228586485481319,
+ 5.1133731033653325,
+ 5.309467724267802,
+ 5.344197821482115,
+ 5.413740986297205,
+ 5.351631226477434,
+ 5.473251710335287,
+ 5.380922913908155,
+ 5.297557865555663,
+ 5.509894058447709
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testAddVWithProps",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 21483.483903484484,
+ "scoreError" : 302.09266328981283,
+ "scoreConfidence" : [
+ 21181.391240194673,
+ 21785.576566774296
+ ],
+ "scorePercentiles" : {
+ "0.0" : 20909.80811562427,
+ "50.0" : 21425.865868362063,
+ "90.0" : 21942.786484069995,
+ "95.0" : 22011.16651682506,
+ "99.0" : 22014.386605077627,
+ "99.9" : 22014.386605077627,
+ "99.99" : 22014.386605077627,
+ "99.999" : 22014.386605077627,
+ "99.9999" : 22014.386605077627,
+ "100.0" : 22014.386605077627
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 21949.98484002627,
+ 21631.306888567375,
+ 21830.071981903395,
+ 22014.386605077627,
+ 21878.00128046351,
+ 21782.144402775408,
+ 21859.9349598704,
+ 21738.587859309304,
+ 21750.06965128056,
+ 21504.836796209413
+ ],
+ [
+ 21005.675177879755,
+ 21137.002217361787,
+ 21313.655828661944,
+ 21249.044184640923,
+ 21105.108023878965,
+ 21165.736620879405,
+ 21266.474525086684,
+ 20909.80811562427,
+ 21230.95316967798,
+ 21346.894940514714
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testAddVWithPropsChained",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 182.8974875312225,
+ "scoreError" : 1.3737648375859044,
+ "scoreConfidence" : [
+ 181.5237226936366,
+ 184.2712523688084
+ ],
+ "scorePercentiles" : {
+ "0.0" : 179.713491221422,
+ "50.0" : 182.64222600496765,
+ "90.0" : 185.25750701491356,
+ "95.0" : 185.4243516504012,
+ "99.0" : 185.43060114093018,
+ "99.9" : 185.43060114093018,
+ "99.99" : 185.43060114093018,
+ "99.999" : 185.43060114093018,
+ "99.9999" : 185.43060114093018,
+ "100.0" : 185.43060114093018
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 181.7994593361268,
+ 181.42553862196698,
+ 183.71845910894876,
+ 183.9077348879139,
+ 182.3280808975595,
+ 179.713491221422,
+ 181.9331569576279,
+ 183.80321801260226,
+ 182.59946016843395,
+ 182.6849918415014
+ ],
+ [
+ 181.258174699377,
+ 185.30561133035062,
+ 184.60765400211906,
+ 181.9868729875841,
+ 181.37782538280305,
+ 185.43060114093018,
+ 184.3924797010399,
+ 183.60540345508667,
+ 181.24696869507622,
+ 184.82456817597992
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testAddVertex",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 6076037.6370537225,
+ "scoreError" : 428580.1655449269,
+ "scoreConfidence" : [
+ 5647457.471508795,
+ 6504617.80259865
+ ],
+ "scorePercentiles" : {
+ "0.0" : 4676453.088917415,
+ "50.0" : 5966892.927455025,
+ "90.0" : 6651030.162753848,
+ "95.0" : 6765672.157300878,
+ "99.0" : 6771577.424417124,
+ "99.9" : 6771577.424417124,
+ "99.99" : 6771577.424417124,
+ "99.999" : 6771577.424417124,
+ "99.9999" : 6771577.424417124,
+ "100.0" : 6771577.424417124
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 5970964.057062402,
+ 6653472.082092202,
+ 6519550.8152237525,
+ 6556593.406938091,
+ 6056628.6584110735,
+ 5997987.0103258435,
+ 6478402.152694274,
+ 6771577.424417124,
+ 6574876.216013707,
+ 6629052.88870866
+ ],
+ [
+ 5793991.918681144,
+ 5422526.059213878,
+ 5926660.978889213,
+ 5916507.618719696,
+ 4676453.088917415,
+ 5874038.509737865,
+ 5962821.797847647,
+ 5948924.505674754,
+ 5875688.1490296535,
+ 5914035.40247604
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testAddVertexWithProps",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 162565.78198569632,
+ "scoreError" : 1751.4290876828752,
+ "scoreConfidence" : [
+ 160814.35289801343,
+ 164317.2110733792
+ ],
+ "scorePercentiles" : {
+ "0.0" : 159259.37618303433,
+ "50.0" : 162388.878386181,
+ "90.0" : 165713.67955584452,
+ "95.0" : 166364.72224707357,
+ "99.0" : 166396.58304837786,
+ "99.9" : 166396.58304837786,
+ "99.99" : 166396.58304837786,
+ "99.999" : 166396.58304837786,
+ "99.9999" : 166396.58304837786,
+ "100.0" : 166396.58304837786
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 162863.49396652522,
+ 160532.98977980454,
+ 162158.3012197521,
+ 163597.0392409601,
+ 161298.0050948953,
+ 160267.66656970116,
+ 159259.37618303433,
+ 162604.83764331872,
+ 160213.25667549463,
+ 163789.44692318107
+ ],
+ [
+ 165302.4923578158,
+ 163505.5573296069,
+ 160946.60444832913,
+ 161736.4370366163,
+ 162172.91912904326,
+ 164661.50214894427,
+ 166396.58304837786,
+ 160466.9537210463,
+ 163782.8101751863,
+ 165759.36702229216
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testEdgeProperty",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 9530710.646459244,
+ "scoreError" : 794340.4179610277,
+ "scoreConfidence" : [
+ 8736370.228498217,
+ 1.0325051064420272E7
+ ],
+ "scorePercentiles" : {
+ "0.0" : 7977636.041941489,
+ "50.0" : 9514042.120404951,
+ "90.0" : 1.0563544793091012E7,
+ "95.0" : 1.0637372054523584E7,
+ "99.0" : 1.0641234701749954E7,
+ "99.9" : 1.0641234701749954E7,
+ "99.99" : 1.0641234701749954E7,
+ "99.999" : 1.0641234701749954E7,
+ "99.9999" : 1.0641234701749954E7,
+ "100.0" : 1.0641234701749954E7
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 8565936.280448416,
+ 8670291.277220355,
+ 8826639.177037943,
+ 8831838.805317903,
+ 8733606.035977675,
+ 8994169.53505037,
+ 8594713.23554361,
+ 8583124.164404362,
+ 7977636.041941489,
+ 8917539.727934636
+ ],
+ [
+ 1.0185159375554737E7,
+ 1.0641234701749954E7,
+ 1.0364466356710833E7,
+ 1.0563981757222552E7,
+ 1.0033914705759535E7,
+ 1.0479829507383104E7,
+ 1.0211701513113616E7,
+ 1.0383438081511434E7,
+ 1.0495380533395205E7,
+ 1.0559612115907162E7
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testEdgePropertyStep",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 125047.24940801214,
+ "scoreError" : 2020.6716899496273,
+ "scoreConfidence" : [
+ 123026.57771806252,
+ 127067.92109796176
+ ],
+ "scorePercentiles" : {
+ "0.0" : 121146.31313219147,
+ "50.0" : 124778.70361566503,
+ "90.0" : 128067.235983295,
+ "95.0" : 129609.15320779022,
+ "99.0" : 129689.39203026914,
+ "99.9" : 129689.39203026914,
+ "99.99" : 129689.39203026914,
+ "99.999" : 129689.39203026914,
+ "99.9999" : 129689.39203026914,
+ "100.0" : 129689.39203026914
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 125464.25292188129,
+ 122878.20110043458,
+ 121146.31313219147,
+ 123849.20356271652,
+ 122899.898187835,
+ 122805.52009721244,
+ 121722.263491683,
+ 123563.52519991409,
+ 123447.47496661522,
+ 125263.71575701259
+ ],
+ [
+ 124280.57471150144,
+ 126496.17015118257,
+ 126971.83509701087,
+ 129689.39203026914,
+ 124293.69147431749,
+ 128084.61558069095,
+ 125833.37688178597,
+ 127540.62062008583,
+ 127910.81960673147,
+ 126803.52358917055
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testVertexProperty",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 3654039.7125632716,
+ "scoreError" : 182500.951974646,
+ "scoreConfidence" : [
+ 3471538.7605886254,
+ 3836540.664537918
+ ],
+ "scorePercentiles" : {
+ "0.0" : 3331983.1740574767,
+ "50.0" : 3658136.679879467,
+ "90.0" : 3917998.254199071,
+ "95.0" : 3932255.2990710293,
+ "99.0" : 3933001.5849017543,
+ "99.9" : 3933001.5849017543,
+ "99.99" : 3933001.5849017543,
+ "99.999" : 3933001.5849017543,
+ "99.9999" : 3933001.5849017543,
+ "100.0" : 3933001.5849017543
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 3753570.166590834,
+ 3933001.5849017543,
+ 3892541.6946386024,
+ 3748331.454083091,
+ 3918075.868287258,
+ 3805278.407569517,
+ 3718388.0076650237,
+ 3885815.671970303,
+ 3832855.7982318313,
+ 3917299.727405389
+ ],
+ [
+ 3513739.7109640473,
+ 3505054.228335125,
+ 3595625.2792971707,
+ 3370814.050879888,
+ 3375206.677562424,
+ 3597885.352093911,
+ 3369177.094577717,
+ 3500185.4406649214,
+ 3331983.1740574767,
+ 3515964.861489148
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphMutateBenchmark.testVertexPropertyStep",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 123313.81251081382,
+ "scoreError" : 1266.0133140428507,
+ "scoreConfidence" : [
+ 122047.79919677097,
+ 124579.82582485667
+ ],
+ "scorePercentiles" : {
+ "0.0" : 120568.04591894265,
+ "50.0" : 123709.76696407187,
+ "90.0" : 125046.547613639,
+ "95.0" : 125621.61490122478,
+ "99.0" : 125649.43598242702,
+ "99.9" : 125649.43598242702,
+ "99.99" : 125649.43598242702,
+ "99.999" : 125649.43598242702,
+ "99.9999" : 125649.43598242702,
+ "100.0" : 125649.43598242702
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 123680.14691462505,
+ 122758.54530505382,
+ 123489.5716939754,
+ 120916.47391130812,
+ 120568.04591894265,
+ 121000.89682194154,
+ 120675.01437987146,
+ 124378.74820227669,
+ 123482.4648435884,
+ 123762.79163722799
+ ],
+ [
+ 124076.81187636306,
+ 123696.32320473867,
+ 125093.01435838222,
+ 123884.2570059224,
+ 124628.3469109501,
+ 123723.21072340508,
+ 123981.66828271121,
+ 122739.69730135033,
+ 124090.78494121564,
+ 125649.43598242702
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+]
+
+
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-benchmark/benchmarks/GraphTraversalBenchmark-20170328111413.json
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/benchmarks/GraphTraversalBenchmark-20170328111413.json b/gremlin-benchmark/benchmarks/GraphTraversalBenchmark-20170328111413.json
new file mode 100644
index 0000000..51543b2
--- /dev/null
+++ b/gremlin-benchmark/benchmarks/GraphTraversalBenchmark-20170328111413.json
@@ -0,0 +1,663 @@
+[
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_E_hasLabelXwrittenByX_whereXinV_inEXsungByX_count_isX0XX_subgraphXsgX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 612.439825278302,
+ "scoreError" : 75.69689023691679,
+ "scoreConfidence" : [
+ 536.7429350413852,
+ 688.1367155152188
+ ],
+ "scorePercentiles" : {
+ "0.0" : 449.43286246858236,
+ "50.0" : 649.9371858116278,
+ "90.0" : 699.0077848376375,
+ "95.0" : 700.9212571421201,
+ "99.0" : 701.0168358050696,
+ "99.9" : 701.0168358050696,
+ "99.99" : 701.0168358050696,
+ "99.999" : 701.0168358050696,
+ "99.9999" : 701.0168358050696,
+ "100.0" : 701.0168358050696
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 580.7297836816679,
+ 543.6420484872089,
+ 523.4570125689916,
+ 515.3688797851839,
+ 449.43286246858236,
+ 482.60316209449064,
+ 497.75887805827193,
+ 699.1052625460792,
+ 694.1184272561607,
+ 701.0168358050696
+ ],
+ [
+ 525.4457545775728,
+ 639.805233465274,
+ 632.0405649505673,
+ 660.0691381579818,
+ 667.030583530728,
+ 667.1850654674147,
+ 684.0853156811705,
+ 698.1304854616624,
+ 695.4172083901774,
+ 692.3540031317865
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_label_groupCount",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 7125.995601279843,
+ "scoreError" : 111.84362653328142,
+ "scoreConfidence" : [
+ 7014.151974746562,
+ 7237.839227813124
+ ],
+ "scorePercentiles" : {
+ "0.0" : 6844.6737007832935,
+ "50.0" : 7124.362219014269,
+ "90.0" : 7339.1644029217705,
+ "95.0" : 7347.772651162333,
+ "99.0" : 7348.054260571642,
+ "99.9" : 7348.054260571642,
+ "99.99" : 7348.054260571642,
+ "99.999" : 7348.054260571642,
+ "99.9999" : 7348.054260571642,
+ "100.0" : 7348.054260571642
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 7086.38493302284,
+ 7088.842291094595,
+ 6925.762344619137,
+ 7026.9324558787785,
+ 7051.66755518111,
+ 7042.484908014778,
+ 7116.14305670164,
+ 7006.819471512311,
+ 7118.343334610717,
+ 7130.38110341782
+ ],
+ [
+ 7145.7639764713795,
+ 7148.626877452125,
+ 7348.054260571642,
+ 7216.477557922724,
+ 7176.009778253431,
+ 6844.6737007832935,
+ 7245.3874303465645,
+ 7342.4220723854705,
+ 7148.889539607985,
+ 7309.845377748469
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_localXout_out_valuesXnameX_foldX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 18.827580365900232,
+ "scoreError" : 0.44854269284356485,
+ "scoreConfidence" : [
+ 18.37903767305667,
+ 19.276123058743796
+ ],
+ "scorePercentiles" : {
+ "0.0" : 17.82991768720435,
+ "50.0" : 18.823501233680368,
+ "90.0" : 19.591440840181107,
+ "95.0" : 19.63164015682559,
+ "99.0" : 19.633348049771143,
+ "99.9" : 19.633348049771143,
+ "99.99" : 19.633348049771143,
+ "99.999" : 19.633348049771143,
+ "99.9999" : 19.633348049771143,
+ "100.0" : 19.633348049771143
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 18.130783496282557,
+ 18.40537190731436,
+ 18.440568062553258,
+ 17.82991768720435,
+ 19.51036272771833,
+ 18.126772083971886,
+ 19.521696684070175,
+ 19.5991901908601,
+ 19.633348049771143,
+ 19.31775332187555
+ ],
+ [
+ 18.64131683046988,
+ 18.95413217529199,
+ 18.825421363114717,
+ 18.892016276577703,
+ 18.821581104246018,
+ 18.777777212248232,
+ 18.38170691381061,
+ 18.78997274963434,
+ 18.843778275492213,
+ 19.108140205497232
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_match_selectXbX_valuesXnameX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 3236.1909441602897,
+ "scoreError" : 33.406273599342185,
+ "scoreConfidence" : [
+ 3202.7846705609477,
+ 3269.597217759632
+ ],
+ "scorePercentiles" : {
+ "0.0" : 3176.864925223407,
+ "50.0" : 3237.267301613985,
+ "90.0" : 3287.4757092437108,
+ "95.0" : 3288.810406534305,
+ "99.0" : 3288.8410172923113,
+ "99.9" : 3288.8410172923113,
+ "99.99" : 3288.8410172923113,
+ "99.999" : 3288.8410172923113,
+ "99.9999" : 3288.8410172923113,
+ "100.0" : 3288.8410172923113
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 3176.864925223407,
+ 3193.939362833486,
+ 3221.565926534811,
+ 3200.3721605307314,
+ 3237.3725889863795,
+ 3197.851360078072,
+ 3216.1289082690664,
+ 3222.2401571040728,
+ 3180.1701173937713,
+ 3184.0058292038952
+ ],
+ [
+ 3274.7684218171544,
+ 3252.1763700733973,
+ 3288.2288021321892,
+ 3288.8410172923113,
+ 3280.6978732474063,
+ 3278.277322681733,
+ 3237.1620142415914,
+ 3265.3559934295517,
+ 3267.4535329612613,
+ 3260.346199171509
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_outE_inV_outE_inV_outE_inV",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 6.352194854803205,
+ "scoreError" : 0.16641344757290322,
+ "scoreConfidence" : [
+ 6.1857814072303015,
+ 6.5186083023761086
+ ],
+ "scorePercentiles" : {
+ "0.0" : 6.064149104036827,
+ "50.0" : 6.328664005286414,
+ "90.0" : 6.730627006423353,
+ "95.0" : 6.774782128968674,
+ "99.0" : 6.776264969524387,
+ "99.9" : 6.776264969524387,
+ "99.99" : 6.776264969524387,
+ "99.999" : 6.776264969524387,
+ "99.9999" : 6.776264969524387,
+ "100.0" : 6.776264969524387
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 6.139898705968545,
+ 6.220258627566029,
+ 6.213391793988725,
+ 6.586796638542381,
+ 6.308054512577817,
+ 6.776264969524387,
+ 6.4794913117246145,
+ 6.326775356817002,
+ 6.347423699009346,
+ 6.330552653755825
+ ],
+ [
+ 6.392334791360671,
+ 6.064149104036827,
+ 6.2659328686392195,
+ 6.2421047573972235,
+ 6.379309927972679,
+ 6.746608158410128,
+ 6.229921513642094,
+ 6.496361620333392,
+ 6.099999317497219,
+ 6.398266767299947
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_out_localXout_out_valuesXnameX_foldX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 4.7718743994437265,
+ "scoreError" : 0.1695167150819116,
+ "scoreConfidence" : [
+ 4.602357684361815,
+ 4.941391114525638
+ ],
+ "scorePercentiles" : {
+ "0.0" : 4.2976209242980135,
+ "50.0" : 4.813373457970508,
+ "90.0" : 4.956829860065536,
+ "95.0" : 5.139054203533505,
+ "99.0" : 5.14861939530646,
+ "99.9" : 5.14861939530646,
+ "99.99" : 5.14861939530646,
+ "99.999" : 5.14861939530646,
+ "99.9999" : 5.14861939530646,
+ "100.0" : 5.14861939530646
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 4.869109489743745,
+ 4.2976209242980135,
+ 4.452227186891854,
+ 4.593832930886771,
+ 4.72837877760051,
+ 4.82483450861059,
+ 4.920210588240835,
+ 4.678689711461762,
+ 4.82853059755099,
+ 4.521391465783362
+ ],
+ [
+ 4.764584069034744,
+ 4.839652165332635,
+ 4.957315559847383,
+ 4.690324165835532,
+ 4.952458562028914,
+ 4.89997489654661,
+ 5.14861939530646,
+ 4.76589326989815,
+ 4.901927316645262,
+ 4.801912407330425
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_out_mapXout_out_valuesXnameX_toListX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 18.359505279819665,
+ "scoreError" : 1.022783079679717,
+ "scoreConfidence" : [
+ 17.33672220013995,
+ 19.38228835949938
+ ],
+ "scorePercentiles" : {
+ "0.0" : 16.0449619549979,
+ "50.0" : 18.551867748489165,
+ "90.0" : 19.568675704258794,
+ "95.0" : 19.59429171737413,
+ "99.0" : 19.59555572482632,
+ "99.9" : 19.59555572482632,
+ "99.99" : 19.59555572482632,
+ "99.999" : 19.59555572482632,
+ "99.9999" : 19.59555572482632,
+ "100.0" : 19.59555572482632
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 18.89134970813983,
+ 18.77249847508772,
+ 19.18082641626379,
+ 19.59555572482632,
+ 19.532559425397338,
+ 19.570275575782556,
+ 19.391220730690247,
+ 19.248514102773218,
+ 18.27157634770676,
+ 19.55427686054493
+ ],
+ [
+ 16.0449619549979,
+ 17.099690163874044,
+ 16.574840829731656,
+ 16.60858828967167,
+ 16.29748255845094,
+ 18.534315065957276,
+ 18.471829708668572,
+ 18.569420431021054,
+ 18.453760424160187,
+ 18.52656280264725
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_out_out_out",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 6.305081213217429,
+ "scoreError" : 0.1735645727035288,
+ "scoreConfidence" : [
+ 6.1315166405139,
+ 6.478645785920958
+ ],
+ "scorePercentiles" : {
+ "0.0" : 6.02552562777593,
+ "50.0" : 6.305586224563296,
+ "90.0" : 6.597674624216339,
+ "95.0" : 6.619576763931361,
+ "99.0" : 6.620418065403375,
+ "99.9" : 6.620418065403375,
+ "99.99" : 6.620418065403375,
+ "99.999" : 6.620418065403375,
+ "99.9999" : 6.620418065403375,
+ "100.0" : 6.620418065403375
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 6.544417918495469,
+ 6.166016819436941,
+ 6.533822768058067,
+ 6.105459413801985,
+ 6.603592035963102,
+ 6.324346727553429,
+ 6.030581668917058,
+ 6.380736575239256,
+ 6.030975725439879,
+ 6.620418065403375
+ ],
+ [
+ 6.373732854788372,
+ 6.209119556000975,
+ 6.171984795132061,
+ 6.1551845858828695,
+ 6.02552562777593,
+ 6.484736044410081,
+ 6.397384199529756,
+ 6.2868257215731616,
+ 6.516368859316213,
+ 6.140394301630579
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_out_out_out_path",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 0.1372045818419321,
+ "scoreError" : 0.03661052906077669,
+ "scoreConfidence" : [
+ 0.10059405278115541,
+ 0.1738151109027088
+ ],
+ "scorePercentiles" : {
+ "0.0" : 0.11495595966142588,
+ "50.0" : 0.12515932553735173,
+ "90.0" : 0.22951562791285057,
+ "95.0" : 0.27463539722427116,
+ "99.0" : 0.27644478177342496,
+ "99.9" : 0.27644478177342496,
+ "99.99" : 0.27644478177342496,
+ "99.999" : 0.27644478177342496,
+ "99.9999" : 0.27644478177342496,
+ "100.0" : 0.27644478177342496
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 0.12513270279334787,
+ 0.1157039181428833,
+ 0.12252082702501162,
+ 0.12977519944656607,
+ 0.11837038770396878,
+ 0.12694472907892865,
+ 0.12712957968959934,
+ 0.12336897727343112,
+ 0.12264302841993469,
+ 0.13284246201536515
+ ],
+ [
+ 0.13168410294644728,
+ 0.12061708479283915,
+ 0.12755335509010912,
+ 0.1251859482813556,
+ 0.11563754467162188,
+ 0.11495595966142588,
+ 0.24025709079034913,
+ 0.27644478177342496,
+ 0.12768792381700036,
+ 0.11963603342503241
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_repeatXoutX_timesX2X",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 219.24940864771352,
+ "scoreError" : 5.112656435074994,
+ "scoreConfidence" : [
+ 214.13675221263853,
+ 224.36206508278852
+ ],
+ "scorePercentiles" : {
+ "0.0" : 201.07754049569522,
+ "50.0" : 219.61141044589147,
+ "90.0" : 225.9963342785886,
+ "95.0" : 226.97397072477918,
+ "99.0" : 227.02257111971434,
+ "99.9" : 227.02257111971434,
+ "99.99" : 227.02257111971434,
+ "99.999" : 227.02257111971434,
+ "99.9999" : 227.02257111971434,
+ "100.0" : 227.02257111971434
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 222.37631737612634,
+ 222.7081979199246,
+ 223.0930422310677,
+ 221.7420100453146,
+ 222.0377275673631,
+ 219.19036908125204,
+ 225.50827379678753,
+ 224.55281474617934,
+ 226.05056322101092,
+ 227.02257111971434
+ ],
+ [
+ 213.09697471940768,
+ 215.00376286446647,
+ 216.79185813700266,
+ 215.0734376069035,
+ 215.95331165831507,
+ 218.88066267704525,
+ 219.45085276955504,
+ 215.60591679891044,
+ 201.07754049569522,
+ 219.77196812222786
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_repeatXoutX_timesX3X",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 7.962066744951059,
+ "scoreError" : 0.2551065167771063,
+ "scoreConfidence" : [
+ 7.706960228173953,
+ 8.217173261728165
+ ],
+ "scorePercentiles" : {
+ "0.0" : 7.509734429891362,
+ "50.0" : 7.926063403803728,
+ "90.0" : 8.455603289018606,
+ "95.0" : 8.469918986979122,
+ "99.0" : 8.470188840977945,
+ "99.9" : 8.470188840977945,
+ "99.99" : 8.470188840977945,
+ "99.999" : 8.470188840977945,
+ "99.9999" : 8.470188840977945,
+ "100.0" : 8.470188840977945
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 7.70142585469009,
+ 7.898488339998322,
+ 7.621911512374095,
+ 8.46479176100148,
+ 8.207482097899325,
+ 7.97856579221494,
+ 8.23535491394363,
+ 7.815526348872802,
+ 7.886192992500037,
+ 8.372907041172732
+ ],
+ [
+ 7.726523345382676,
+ 7.647099949183109,
+ 8.470188840977945,
+ 7.732211733751928,
+ 7.667153112071045,
+ 7.99288962130756,
+ 8.266940910857667,
+ 7.509734429891362,
+ 8.092307833321344,
+ 7.953638467609134
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+]
+
+
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-benchmark/benchmarks/GraphTraversalBenchmark-20170328115443.json
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/benchmarks/GraphTraversalBenchmark-20170328115443.json b/gremlin-benchmark/benchmarks/GraphTraversalBenchmark-20170328115443.json
new file mode 100644
index 0000000..e5a7722
--- /dev/null
+++ b/gremlin-benchmark/benchmarks/GraphTraversalBenchmark-20170328115443.json
@@ -0,0 +1,663 @@
+[
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_E_hasLabelXwrittenByX_whereXinV_inEXsungByX_count_isX0XX_subgraphXsgX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 700.6816607679222,
+ "scoreError" : 21.678928985166657,
+ "scoreConfidence" : [
+ 679.0027317827555,
+ 722.3605897530888
+ ],
+ "scorePercentiles" : {
+ "0.0" : 641.0374535792678,
+ "50.0" : 706.5330658115993,
+ "90.0" : 734.4473864548495,
+ "95.0" : 741.8912401172852,
+ "99.0" : 742.2519387885019,
+ "99.9" : 742.2519387885019,
+ "99.99" : 742.2519387885019,
+ "99.999" : 742.2519387885019,
+ "99.9999" : 742.2519387885019,
+ "100.0" : 742.2519387885019
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 703.437699338217,
+ 641.0374535792678,
+ 662.7453699151517,
+ 681.7125572037933,
+ 678.2165479813511,
+ 673.6917989907396,
+ 710.4088837253515,
+ 704.7269483306841,
+ 714.3918510762321,
+ 693.2184258726336
+ ],
+ [
+ 690.1038160022555,
+ 742.2519387885019,
+ 708.3391832925146,
+ 724.5109949265293,
+ 689.0573667660346,
+ 710.6026212633642,
+ 712.4609904874907,
+ 735.0379653641673,
+ 729.1321762709892,
+ 708.5486261831762
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_label_groupCount",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 7045.295579010742,
+ "scoreError" : 187.68290630298193,
+ "scoreConfidence" : [
+ 6857.61267270776,
+ 7232.9784853137235
+ ],
+ "scorePercentiles" : {
+ "0.0" : 6323.567698554869,
+ "50.0" : 7085.214200017152,
+ "90.0" : 7214.604745061389,
+ "95.0" : 7316.2902707224885,
+ "99.0" : 7321.534787413918,
+ "99.9" : 7321.534787413918,
+ "99.99" : 7321.534787413918,
+ "99.999" : 7321.534787413918,
+ "99.9999" : 7321.534787413918,
+ "100.0" : 7321.534787413918
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 7175.019109610836,
+ 7194.331025493169,
+ 7196.247368345934,
+ 7184.1041953384465,
+ 7321.534787413918,
+ 7216.644453585328,
+ 7178.872595337084,
+ 7192.182983979106,
+ 6967.514425860633,
+ 6939.083312518915
+ ],
+ [
+ 7154.36981040912,
+ 6857.496646358901,
+ 7039.022333661504,
+ 6323.567698554869,
+ 6831.883463109846,
+ 7050.631328793228,
+ 6883.22385577429,
+ 7029.753786035385,
+ 7103.9569506884045,
+ 7066.471449345898
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_localXout_out_valuesXnameX_foldX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 18.45785246237018,
+ "scoreError" : 0.8465257459379678,
+ "scoreConfidence" : [
+ 17.611326716432213,
+ 19.304378208308147
+ ],
+ "scorePercentiles" : {
+ "0.0" : 16.206948995175644,
+ "50.0" : 18.777335797399545,
+ "90.0" : 19.458088612202197,
+ "95.0" : 19.550339421621594,
+ "99.0" : 19.555148492108074,
+ "99.9" : 19.555148492108074,
+ "99.99" : 19.555148492108074,
+ "99.999" : 19.555148492108074,
+ "99.9999" : 19.555148492108074,
+ "100.0" : 19.555148492108074
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 19.09598256971416,
+ 18.766662153844127,
+ 18.82483686953683,
+ 19.450182380616024,
+ 19.411746925864037,
+ 18.797953486591233,
+ 19.04074022659844,
+ 19.45896708237844,
+ 19.38449151025906,
+ 19.555148492108074
+ ],
+ [
+ 18.58310055261329,
+ 18.667188813482355,
+ 18.788009440954966,
+ 18.27494059870025,
+ 18.04040683867159,
+ 17.5042620057853,
+ 16.206948995175644,
+ 16.804358300080168,
+ 17.29031103964142,
+ 17.21081096478813
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_match_selectXbX_valuesXnameX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 3095.0630121232753,
+ "scoreError" : 40.796882118013585,
+ "scoreConfidence" : [
+ 3054.266130005262,
+ 3135.8598942412887
+ ],
+ "scorePercentiles" : {
+ "0.0" : 3004.046943749074,
+ "50.0" : 3097.5342985787825,
+ "90.0" : 3156.853787232964,
+ "95.0" : 3172.0484429212115,
+ "99.0" : 3172.829883055273,
+ "99.9" : 3172.829883055273,
+ "99.99" : 3172.829883055273,
+ "99.999" : 3172.829883055273,
+ "99.9999" : 3172.829883055273,
+ "100.0" : 3172.829883055273
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 3046.5787774589426,
+ 3091.1173428533416,
+ 3029.57568272412,
+ 3085.204650984951,
+ 3068.2564999751316,
+ 3028.6577027631524,
+ 3118.809093396791,
+ 3050.057138003549,
+ 3004.046943749074,
+ 3092.7029791319087
+ ],
+ [
+ 3128.6808391332715,
+ 3114.9107857272616,
+ 3102.365618025656,
+ 3172.829883055273,
+ 3157.201080374047,
+ 3153.7281489632173,
+ 3126.8372261006134,
+ 3070.617640973644,
+ 3141.0886657498395,
+ 3117.99354332171
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_outE_inV_outE_inV_outE_inV",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 6.28965939370594,
+ "scoreError" : 0.21414489901125158,
+ "scoreConfidence" : [
+ 6.075514494694689,
+ 6.5038042927171915
+ ],
+ "scorePercentiles" : {
+ "0.0" : 5.828253464040659,
+ "50.0" : 6.299847400508732,
+ "90.0" : 6.59903775267821,
+ "95.0" : 6.8462437200881565,
+ "99.0" : 6.85914446412394,
+ "99.9" : 6.85914446412394,
+ "99.99" : 6.85914446412394,
+ "99.999" : 6.85914446412394,
+ "99.9999" : 6.85914446412394,
+ "100.0" : 6.85914446412394
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 6.601129583408276,
+ 6.295469868648645,
+ 6.580211276107611,
+ 6.333906549463143,
+ 6.500128774051142,
+ 6.85914446412394,
+ 6.31193345753439,
+ 6.2067000488235875,
+ 6.297783595198429,
+ 6.461076516435796
+ ],
+ [
+ 6.098810514570626,
+ 5.828253464040659,
+ 6.224632577012257,
+ 6.387031042225461,
+ 5.935553506772072,
+ 6.219636705422364,
+ 6.346169564604655,
+ 5.955412605978093,
+ 6.048292553878605,
+ 6.301911205819033
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_out_localXout_out_valuesXnameX_foldX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 4.8596147559171445,
+ "scoreError" : 0.12180157530651291,
+ "scoreConfidence" : [
+ 4.737813180610631,
+ 4.981416331223658
+ ],
+ "scorePercentiles" : {
+ "0.0" : 4.433096705950343,
+ "50.0" : 4.878474302224237,
+ "90.0" : 4.9910555052593395,
+ "95.0" : 5.07541385688831,
+ "99.0" : 5.079777684173091,
+ "99.9" : 5.079777684173091,
+ "99.99" : 5.079777684173091,
+ "99.999" : 5.079777684173091,
+ "99.9999" : 5.079777684173091,
+ "100.0" : 5.079777684173091
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 4.836578063290826,
+ 4.883349310756998,
+ 4.978044806296087,
+ 4.8982226864618355,
+ 4.873599293691478,
+ 4.698649095533354,
+ 4.834893880911019,
+ 4.9335007270130005,
+ 4.975658516288902,
+ 4.806268279722203
+ ],
+ [
+ 4.950936555399675,
+ 4.846868093088767,
+ 4.433096705950343,
+ 4.732033471626128,
+ 4.992501138477478,
+ 4.707282097054407,
+ 4.852890082103698,
+ 4.942100431963398,
+ 4.936044198540199,
+ 5.079777684173091
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_out_mapXout_out_valuesXnameX_toListX",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 18.36988174795229,
+ "scoreError" : 0.605408645578075,
+ "scoreConfidence" : [
+ 17.764473102374218,
+ 18.975290393530365
+ ],
+ "scorePercentiles" : {
+ "0.0" : 17.40882842774406,
+ "50.0" : 18.31413236404343,
+ "90.0" : 19.44072894174928,
+ "95.0" : 19.831263171853493,
+ "99.0" : 19.849847436901204,
+ "99.9" : 19.849847436901204,
+ "99.99" : 19.849847436901204,
+ "99.999" : 19.849847436901204,
+ "99.9999" : 19.849847436901204,
+ "100.0" : 19.849847436901204
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 17.671454404935066,
+ 17.573003807958628,
+ 17.72183138260094,
+ 17.616337468096848,
+ 17.40882842774406,
+ 18.20062869703683,
+ 18.314156963531513,
+ 17.804620797824246,
+ 17.84368270168329,
+ 17.756964615945208
+ ],
+ [
+ 18.888236284861193,
+ 19.02861151255905,
+ 19.103830193970033,
+ 19.849847436901204,
+ 18.75021925420857,
+ 18.31410776455535,
+ 18.549857001300254,
+ 18.9203113004227,
+ 19.478162135946977,
+ 18.60294280696381
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_out_out_out",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 6.30174218716075,
+ "scoreError" : 0.18190681075983622,
+ "scoreConfidence" : [
+ 6.119835376400914,
+ 6.483648997920586
+ ],
+ "scorePercentiles" : {
+ "0.0" : 5.933949741181796,
+ "50.0" : 6.267145061864171,
+ "90.0" : 6.6073498855326624,
+ "95.0" : 6.637339435168901,
+ "99.0" : 6.638803916440216,
+ "99.9" : 6.638803916440216,
+ "99.99" : 6.638803916440216,
+ "99.999" : 6.638803916440216,
+ "99.9999" : 6.638803916440216,
+ "100.0" : 6.638803916440216
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 6.395194900512515,
+ 6.071640007308277,
+ 6.516280045997117,
+ 5.953872982318405,
+ 6.134169899272698,
+ 6.25159035993335,
+ 6.4168435234299634,
+ 6.164140463505093,
+ 6.609514291013902,
+ 6.369420828436682
+ ],
+ [
+ 6.282699763794992,
+ 6.249057134448233,
+ 6.587870236201509,
+ 6.251463791410087,
+ 6.536180714139575,
+ 6.638803916440216,
+ 6.250352614758896,
+ 6.083498666387155,
+ 5.933949741181796,
+ 6.338299862724559
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_out_out_out_path",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 0.1366153232986512,
+ "scoreError" : 0.03656185965920502,
+ "scoreConfidence" : [
+ 0.10005346363944617,
+ 0.17317718295785622
+ ],
+ "scorePercentiles" : {
+ "0.0" : 0.11363847747991979,
+ "50.0" : 0.12334175533897956,
+ "90.0" : 0.22946090460745988,
+ "95.0" : 0.2728536851138505,
+ "99.0" : 0.27458510453619817,
+ "99.9" : 0.27458510453619817,
+ "99.99" : 0.27458510453619817,
+ "99.999" : 0.27458510453619817,
+ "99.9999" : 0.27458510453619817,
+ "100.0" : 0.27458510453619817
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 0.12644960382721415,
+ 0.128477110575088,
+ 0.13059226440516808,
+ 0.11772605710748535,
+ 0.11850749626094362,
+ 0.12083082336498575,
+ 0.12429524991045571,
+ 0.1223882607675034,
+ 0.11943664371841371,
+ 0.11572566028081792
+ ],
+ [
+ 0.13093986815464076,
+ 0.13085682501630866,
+ 0.11710930526600159,
+ 0.12184592289571747,
+ 0.13499860127139232,
+ 0.11363847747991979,
+ 0.11424359905532772,
+ 0.23995671608924532,
+ 0.27458510453619817,
+ 0.129702875990197
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_repeatXoutX_timesX2X",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 220.08577837192416,
+ "scoreError" : 5.390165464900967,
+ "scoreConfidence" : [
+ 214.6956129070232,
+ 225.47594383682514
+ ],
+ "scorePercentiles" : {
+ "0.0" : 207.7253297818374,
+ "50.0" : 219.82436124494777,
+ "90.0" : 229.87848294974478,
+ "95.0" : 230.72736842311474,
+ "99.0" : 230.76353245455024,
+ "99.9" : 230.76353245455024,
+ "99.99" : 230.76353245455024,
+ "99.999" : 230.76353245455024,
+ "99.9999" : 230.76353245455024,
+ "100.0" : 230.76353245455024
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 210.70132581382708,
+ 213.97493829383265,
+ 218.30772611617482,
+ 219.51085759021686,
+ 218.90174113765207,
+ 220.28870253884514,
+ 221.29595400380742,
+ 219.57946470289298,
+ 214.59227446392626,
+ 221.76847570727787
+ ],
+ [
+ 224.184313669533,
+ 226.01771615673246,
+ 225.46128416039485,
+ 228.4225630648837,
+ 230.76353245455024,
+ 230.04025182584044,
+ 214.80988385982408,
+ 207.7253297818374,
+ 220.06925778700256,
+ 215.29997430943024
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+ ,
+ {
+ "benchmark" : "org.apache.tinkerpop.gremlin.process.GraphTraversalBenchmark.g_V_repeatXoutX_timesX3X",
+ "mode" : "thrpt",
+ "threads" : 1,
+ "forks" : 2,
+ "warmupIterations" : 10,
+ "warmupTime" : "1 s",
+ "measurementIterations" : 10,
+ "measurementTime" : "1 s",
+ "primaryMetric" : {
+ "score" : 7.959093057651176,
+ "scoreError" : 0.40987521560908646,
+ "scoreConfidence" : [
+ 7.549217842042089,
+ 8.368968273260261
+ ],
+ "scorePercentiles" : {
+ "0.0" : 6.771959459300946,
+ "50.0" : 8.010566686481575,
+ "90.0" : 8.473522310870367,
+ "95.0" : 8.668511774810725,
+ "99.0" : 8.67827340736447,
+ "99.9" : 8.67827340736447,
+ "99.99" : 8.67827340736447,
+ "99.999" : 8.67827340736447,
+ "99.9999" : 8.67827340736447,
+ "100.0" : 8.67827340736447
+ },
+ "scoreUnit" : "ops/s",
+ "rawData" : [
+ [
+ 7.7076858076378185,
+ 7.777546377409399,
+ 8.33648950510305,
+ 8.67827340736447,
+ 7.887073971183871,
+ 7.872277634533328,
+ 8.200988357420407,
+ 7.565212382914469,
+ 7.97168137516781,
+ 8.483040756289551
+ ],
+ [
+ 8.19181298305039,
+ 8.027363333630845,
+ 8.241667568320361,
+ 8.387856302097704,
+ 8.08905327187321,
+ 8.26877792748737,
+ 6.771959459300946,
+ 7.824979527995122,
+ 7.993770039332306,
+ 6.9043511649111045
+ ]
+ ]
+ },
+ "secondaryMetrics" : {
+ }
+ }
+]
+
+
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
index 728168f..b184688 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
@@ -29,7 +29,6 @@ import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV2d0;
import org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0;
import org.apache.tinkerpop.gremlin.groovy.engine.GremlinExecutor;
import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
-import org.apache.tinkerpop.gremlin.server.handler.IteratorHandler;
import org.apache.tinkerpop.gremlin.server.handler.OpExecutorHandler;
import org.apache.tinkerpop.gremlin.server.handler.OpSelectorHandler;
import io.netty.channel.ChannelInitializer;
@@ -83,7 +82,6 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
protected static final String PIPELINE_SSL = "ssl";
protected static final String PIPELINE_OP_SELECTOR = "op-selector";
- protected static final String PIPELINE_RESULT_ITERATOR_HANDLER = "result-iterator-handler";
protected static final String PIPELINE_OP_EXECUTOR = "op-executor";
protected static final String PIPELINE_AUTHENTICATOR = "authenticator";
@@ -91,7 +89,6 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
private OpSelectorHandler opSelectorHandler;
private OpExecutorHandler opExecutorHandler;
- private IteratorHandler iteratorHandler;
protected Authenticator authenticator;
@@ -131,7 +128,6 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
// these handlers don't share any state and can thus be initialized once per pipeline
opSelectorHandler = new OpSelectorHandler(settings, graphManager, gremlinExecutor, scheduledExecutorService);
opExecutorHandler = new OpExecutorHandler(settings, graphManager, gremlinExecutor, scheduledExecutorService);
- iteratorHandler = new IteratorHandler(settings);
}
@Override
@@ -146,7 +142,6 @@ public abstract class AbstractChannelizer extends ChannelInitializer<SocketChann
configure(pipeline);
pipeline.addLast(PIPELINE_OP_SELECTOR, opSelectorHandler);
- pipeline.addLast(PIPELINE_RESULT_ITERATOR_HANDLER, iteratorHandler);
pipeline.addLast(PIPELINE_OP_EXECUTOR, opExecutorHandler);
finalize(pipeline);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java
index 584dac1..c4fbb36 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/AllowAllAuthenticator.java
@@ -42,15 +42,8 @@ public final class AllowAllAuthenticator implements Authenticator {
return AuthenticatedUser.ANONYMOUS_USER;
}
- /**
- * @deprecated As of release 3.1.1-incubating, replaced by {@link #newSaslNegotiator(InetAddress)}.
- * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-995">TINKERPOP-995</a>
- */
@Override
- @Deprecated
- public SaslNegotiator newSaslNegotiator() {
- // While this method is deprecated, it remains here to ensure backward compatibility with the old method. In
- // this way the integration tests can continue to execute here
+ public SaslNegotiator newSaslNegotiator(final InetAddress remoteAddress) {
return AUTHENTICATOR_INSTANCE;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
index 002cf8d..4f2eb20 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Authenticator.java
@@ -46,31 +46,13 @@ public interface Authenticator {
public void setup(final Map<String,Object> config);
/**
- * Provide a SASL handler to perform authentication for an single connection. SASL is a stateful protocol, so a
- * new instance must be used for each authentication attempt.)
- *
- * @deprecated As of release 3.1.1-incubating, replaced by {@link #newSaslNegotiator(InetAddress)}.
- * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-995">TINKERPOP-995</a>
- */
- @Deprecated
- public SaslNegotiator newSaslNegotiator();
-
- /**
* Provide a SASL handler to perform authentication for an single connection. SASL is a stateful protocol, so
* a new instance must be used for each authentication attempt.
*
- * As of 3.1.1, this method by default calls the {@link #newSaslNegotiator()} method so as not to introduce a
- * breaking change. Implementers should move their code from {@link #newSaslNegotiator()} to this method as
- * this is the method now called by Gremlin Server during authentication. For full backwards compatibility,
- * it makes sense to call this method from {@link #newSaslNegotiator()} passing {@code null} for the
- * {@code remoteAddress} parameter.
- *
* @param remoteAddress the IP address of the client to authenticate to authenticate or null if an internal
* client (one not connected over the remote transport).
*/
- public default SaslNegotiator newSaslNegotiator(final InetAddress remoteAddress) {
- return newSaslNegotiator();
- }
+ public SaslNegotiator newSaslNegotiator(final InetAddress remoteAddress);
/**
* A "standard" authentication implementation that can be used more generically without SASL support. This
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
index 9733523..a92e404 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/Krb5Authenticator.java
@@ -88,15 +88,6 @@ public class Krb5Authenticator implements Authenticator {
);
}
- /**
- * @deprecated As of release 3.1.1-incubating, replaced by {@link #newSaslNegotiator(InetAddress)}.
- */
- @Override
- @Deprecated
- public SaslNegotiator newSaslNegotiator() {
- return null;
- }
-
public AuthenticatedUser authenticate(final Map<String, String> credentials) throws AuthenticationException {
logger.error("Authenticate() should not be called. Use getAuthenticatedUser() when isComplete() is true.");
return null;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
index c3b1f87..8d90bf8 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/auth/SimpleAuthenticator.java
@@ -50,13 +50,6 @@ public class SimpleAuthenticator implements Authenticator {
private CredentialGraph credentialStore;
/**
- * @deprecated As of release 3.1.1-incubating, if using TinkerGraph, simply rely on it's "persistence" features.
- * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-981">TINKERPOP-981</a>
- */
- @Deprecated
- public static final String CONFIG_CREDENTIALS_LOCATION = "credentialsDbLocation";
-
- /**
* The location of the configuration file that contains the credentials database.
*/
public static final String CONFIG_CREDENTIALS_DB = "credentialsDb";
@@ -87,33 +80,14 @@ public class SimpleAuthenticator implements Authenticator {
// have to create the indices because they are not stored in gryo
final TinkerGraph tinkerGraph = (TinkerGraph) graph;
tinkerGraph.createIndex(PROPERTY_USERNAME, Vertex.class);
-
- // we deprecated credentialsLocation, but we still need to support it. if it is present as a key, we can
- // load the data as we always did.
- if (config.containsKey(CONFIG_CREDENTIALS_LOCATION)) {
- logger.warn("Using {} configuration option which is deprecated - prefer including the location of the credentials graph data in the TinkerGraph config file.");
- final String location = (String) config.get(CONFIG_CREDENTIALS_LOCATION);
- try {
- tinkerGraph.io(IoCore.gryo()).readGraph(location);
- } catch (IOException e) {
- logger.warn("Could not read credentials graph from {} - authentication is enabled, but with an empty user database", location);
- }
- }
}
credentialStore = CredentialGraph.credentials(graph);
logger.info("CredentialGraph initialized at {}", credentialStore);
}
- /**
- * @deprecated As of release 3.1.1-incubating, replaced by {@link #newSaslNegotiator(InetAddress)}.
- * @see <a href="https://issues.apache.org/jira/browse/TINKERPOP-995">TINKERPOP-995</a>
- */
@Override
- @Deprecated
- public SaslNegotiator newSaslNegotiator() {
- // While this method is deprecated, it remains here to ensure backward compatibility with the old method. In
- // this way the integration tests can continue to execute here
+ public SaslNegotiator newSaslNegotiator(final InetAddress remoteAddress) {
return new PlainTextSaslAuthenticator();
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2d1063e/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
index b509e2d..d5acbdc 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/channel/HttpChannelizer.java
@@ -79,7 +79,6 @@ public class HttpChannelizer extends AbstractChannelizer {
@Override
public void finalize(final ChannelPipeline pipeline) {
pipeline.remove(PIPELINE_OP_SELECTOR);
- pipeline.remove(PIPELINE_RESULT_ITERATOR_HANDLER);
pipeline.remove(PIPELINE_OP_EXECUTOR);
}
}