asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From buyin...@apache.org
Subject [1/6] asterixdb git commit: Add cluster performance testing scripts.
Date Thu, 16 Feb 2017 20:53:05 GMT
Repository: asterixdb
Updated Branches:
  refs/heads/master 2898a0107 -> 73715d878


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-benchmarks/src/main/resources/tpc-h/results/q17_small_quantity_order_revenue.3.query.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-benchmarks/src/main/resources/tpc-h/results/q17_small_quantity_order_revenue.3.query.adm
b/asterixdb/asterix-benchmarks/src/main/resources/tpc-h/results/q17_small_quantity_order_revenue.3.query.adm
deleted file mode 100644
index e29b0d9..0000000
--- a/asterixdb/asterix-benchmarks/src/main/resources/tpc-h/results/q17_small_quantity_order_revenue.3.query.adm
+++ /dev/null
@@ -1 +0,0 @@
-348406.0542857142
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-benchmarks/src/main/resources/tpc-h/results/q20_potential_part_promotion.3.query.adm
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-benchmarks/src/main/resources/tpc-h/results/q20_potential_part_promotion.3.query.adm
b/asterixdb/asterix-benchmarks/src/main/resources/tpc-h/results/q20_potential_part_promotion.3.query.adm
deleted file mode 100644
index d10c192..0000000
--- a/asterixdb/asterix-benchmarks/src/main/resources/tpc-h/results/q20_potential_part_promotion.3.query.adm
+++ /dev/null
@@ -1,186 +0,0 @@
-{ "s_name": "Supplier#000000020", "s_address": "iybAE,RmTymrZVYaFZva2SH,j" }
-{ "s_name": "Supplier#000000091", "s_address": "YV45D7TkfdQanOOZ7q9QxkyGUapU1oOWU6q3" }
-{ "s_name": "Supplier#000000205", "s_address": "rF uV8d0JNEk" }
-{ "s_name": "Supplier#000000285", "s_address": "Br7e1nnt1yxrw6ImgpJ7YdhFDjuBf" }
-{ "s_name": "Supplier#000000287", "s_address": "7a9SP7qW5Yku5PvSg" }
-{ "s_name": "Supplier#000000354", "s_address": "w8fOo5W,aS" }
-{ "s_name": "Supplier#000000378", "s_address": "FfbhyCxWvcPrO8ltp9" }
-{ "s_name": "Supplier#000000402", "s_address": "i9Sw4DoyMhzhKXCH9By,AYSgmD" }
-{ "s_name": "Supplier#000000530", "s_address": "0qwCMwobKY OcmLyfRXlagA8ukENJv," }
-{ "s_name": "Supplier#000000555", "s_address": "TfB,a5bfl3Ah 3Z 74GqnNs6zKVGM" }
-{ "s_name": "Supplier#000000640", "s_address": "mvvtlQKsTOsJj5Ihk7,cq" }
-{ "s_name": "Supplier#000000729", "s_address": "pqck2ppy758TQpZCUAjPvlU55K3QjfL7Bi" }
-{ "s_name": "Supplier#000000736", "s_address": "l6i2nMwVuovfKnuVgaSGK2rDy65DlAFLegiL7" }
-{ "s_name": "Supplier#000000761", "s_address": "zlSLelQUj2XrvTTFnv7WAcYZGvvMTx882d4" }
-{ "s_name": "Supplier#000000887", "s_address": "urEaTejH5POADP2ARrf" }
-{ "s_name": "Supplier#000000935", "s_address": "ij98czM 2KzWe7dDTOxB8sq0UfCdvrX" }
-{ "s_name": "Supplier#000000975", "s_address": ",AC e,tBpNwKb5xMUzeohxlRn, hdZJo73gFQF8y"
}
-{ "s_name": "Supplier#000001263", "s_address": "rQWr6nf8ZhB2TAiIDIvo5Io" }
-{ "s_name": "Supplier#000001367", "s_address": "42YSkFcAXMMcucsqeEefOE4HeCC" }
-{ "s_name": "Supplier#000001426", "s_address": "bPOCc086oFm8sLtS,fGrH" }
-{ "s_name": "Supplier#000001446", "s_address": "lch9HMNU1R7a0LIybsUodVknk6" }
-{ "s_name": "Supplier#000001500", "s_address": "wDmF5xLxtQch9ctVu," }
-{ "s_name": "Supplier#000001602", "s_address": "uKNWIeafaM644" }
-{ "s_name": "Supplier#000001626", "s_address": "UhxNRzUu1dtFmp0" }
-{ "s_name": "Supplier#000001682", "s_address": "pXTkGxrTQVyH1Rr" }
-{ "s_name": "Supplier#000001700", "s_address": "7hMlCof1Y5zLFg" }
-{ "s_name": "Supplier#000001726", "s_address": "TeRY7TtTH24sEword7yAaSkjx8" }
-{ "s_name": "Supplier#000001730", "s_address": "Rc8e,1Pybn r6zo0VJIEiD0UD vhk" }
-{ "s_name": "Supplier#000001746", "s_address": "qWsendlOekQG1aW4uq06uQaCm51se8lirv7 hBRd"
}
-{ "s_name": "Supplier#000001806", "s_address": "M934fuZSnLW" }
-{ "s_name": "Supplier#000001855", "s_address": "MWk6EAeozXb" }
-{ "s_name": "Supplier#000001931", "s_address": "FpJbMU2h6ZR2eBv8I9NIxF" }
-{ "s_name": "Supplier#000002022", "s_address": " dwebGX7Id2pc25YvY33" }
-{ "s_name": "Supplier#000002036", "s_address": "20ytTtVObjKUUI2WCB0A" }
-{ "s_name": "Supplier#000002096", "s_address": "kuxseyLtq QPLXxm9ZUrnB6Kkh92JtK5cQzzXNU "
}
-{ "s_name": "Supplier#000002117", "s_address": "MRtkgKolHJ9Wh X9J,urANHKDzvjr" }
-{ "s_name": "Supplier#000002204", "s_address": "uYmlr46C06udCqanj0KiRsoTQakZsEyssL" }
-{ "s_name": "Supplier#000002218", "s_address": "nODZw5q4dx kp0K5" }
-{ "s_name": "Supplier#000002243", "s_address": "nSOEV3JeOU79" }
-{ "s_name": "Supplier#000002245", "s_address": "hz2qWXWVjOyKhqPYMoEwz6zFkrTaDM" }
-{ "s_name": "Supplier#000002282", "s_address": "ES21K9dxoW1I1TzWCj7ekdlNwSWnv1Z  6mQ,BKn"
}
-{ "s_name": "Supplier#000002303", "s_address": "nCoWfpB6YOymbgOht7ltfklpkHl" }
-{ "s_name": "Supplier#000002331", "s_address": "WRh2w5WFvRg7Z0S1AvSvHCL" }
-{ "s_name": "Supplier#000002373", "s_address": "RzHSxOTQmElCjxIBiVA52Z JB58rJhPRylR" }
-{ "s_name": "Supplier#000002419", "s_address": "qydBQd14I5l5mVXa4fYY" }
-{ "s_name": "Supplier#000002571", "s_address": "JZUugz04c iJFLrlGsz9O N,W 1rVHNIReyq" }
-{ "s_name": "Supplier#000002585", "s_address": "CsPoKpw2QuTY4AV1NkWuttneIa4SN" }
-{ "s_name": "Supplier#000002629", "s_address": "0Bw,q5Zp8su9XrzoCngZ3cAEXZwZ" }
-{ "s_name": "Supplier#000002721", "s_address": "HVdFAN2JHMQSpKm" }
-{ "s_name": "Supplier#000002730", "s_address": "lIFxR4fzm31C6,muzJwl84z" }
-{ "s_name": "Supplier#000002775", "s_address": "yDclaDaBD4ihH" }
-{ "s_name": "Supplier#000002799", "s_address": "lwr, 6L3gdfc79PQut,4XO6nQsTJY63cAyYO" }
-{ "s_name": "Supplier#000002934", "s_address": "m,trBENywSArwg3DhB" }
-{ "s_name": "Supplier#000002941", "s_address": "Naddba 8YTEKekZyP0" }
-{ "s_name": "Supplier#000003028", "s_address": "jouzgX0WZjhNMWLaH4fy" }
-{ "s_name": "Supplier#000003095", "s_address": "HxON3jJhUi3zjt,r mTD" }
-{ "s_name": "Supplier#000003143", "s_address": "hdolgh608uTkHh7t6qfSqkifKaiFjnCH" }
-{ "s_name": "Supplier#000003185", "s_address": "hMa535Cbf2mj1Nw4OWOKWVrsK0VdDkJURrdjSIJe"
}
-{ "s_name": "Supplier#000003189", "s_address": "DWdPxt7 RnkZv6VOByR0em" }
-{ "s_name": "Supplier#000003201", "s_address": "E87yws6I,t0qNs4QW7UzExKiJnJDZWue" }
-{ "s_name": "Supplier#000003213", "s_address": "pxrRP4irQ1VoyfQ,dTf3" }
-{ "s_name": "Supplier#000003275", "s_address": "9xO4nyJ2QJcX6vGf" }
-{ "s_name": "Supplier#000003288", "s_address": "EDdfNt7E5Uc,xLTupoIgYL4yY7ujh," }
-{ "s_name": "Supplier#000003314", "s_address": "jnisU8MzqO4iUB3zsPcrysMw3DDUojS4q7LD" }
-{ "s_name": "Supplier#000003373", "s_address": "iy8VM48ynpc3N2OsBwAvhYakO2us9R1bi" }
-{ "s_name": "Supplier#000003421", "s_address": "Sh3dt9W5oeofFWovnFhrg," }
-{ "s_name": "Supplier#000003422", "s_address": "DJoCEapUeBXoV1iYiCcPFQvzsTv2ZI960" }
-{ "s_name": "Supplier#000003441", "s_address": "zvFJIzS,oUuShHjpcX" }
-{ "s_name": "Supplier#000003590", "s_address": "sy79CMLxqb,Cbo" }
-{ "s_name": "Supplier#000003607", "s_address": "lNqFHQYjwSAkf" }
-{ "s_name": "Supplier#000003625", "s_address": "qY588W0Yk5iaUy1RXTgNrEKrMAjBYHcKs" }
-{ "s_name": "Supplier#000003723", "s_address": "jZEp0OEythCLcS OmJSrFtxJ66bMlzSp" }
-{ "s_name": "Supplier#000003849", "s_address": "KgbZEaRk,6Q3mWvwh6uptrs1KRUHg 0" }
-{ "s_name": "Supplier#000003894", "s_address": "vvGC rameLOk" }
-{ "s_name": "Supplier#000003941", "s_address": "Pmb05mQfBMS618O7WKqZJ 9vyv" }
-{ "s_name": "Supplier#000004059", "s_address": "umEYZSq9RJ2WEzdsv9meU8rmqwzVLRgiZwC" }
-{ "s_name": "Supplier#000004207", "s_address": "tF64pwiOM4IkWjN3mS,e06WuAjLx" }
-{ "s_name": "Supplier#000004236", "s_address": "dl,HPtJmGipxYsSqn9wmqkuWjst,mCeJ8O6T" }
-{ "s_name": "Supplier#000004278", "s_address": "bBddbpBxIVp Di9" }
-{ "s_name": "Supplier#000004281", "s_address": "1OwPHh Pgiyeus,iZS5eA23JDOipwk" }
-{ "s_name": "Supplier#000004304", "s_address": "hQCAz59k,HLlp2CKUrcBIL" }
-{ "s_name": "Supplier#000004346", "s_address": "S3076LEOwo" }
-{ "s_name": "Supplier#000004406", "s_address": "Ah0ZaLu6VwufPWUz,7kbXgYZhauEaHqGIg" }
-{ "s_name": "Supplier#000004430", "s_address": "yvSsKNSTL5HLXBET4luOsPNLxKzAMk" }
-{ "s_name": "Supplier#000004527", "s_address": "p pVXCnxgcklWF6A1o3OHY3qW6" }
-{ "s_name": "Supplier#000004655", "s_address": "67NqBc4 t3PG3F8aO IsqWNq4kGaPowYL" }
-{ "s_name": "Supplier#000004851", "s_address": "Rj,x6IgLT7kBL99nqp" }
-{ "s_name": "Supplier#000004871", "s_address": ",phpt6AWEnUS8t4Avb50rFfdg7O9c6nU8xxv8eC5"
}
-{ "s_name": "Supplier#000004884", "s_address": "42Z1uLye9nsn6aTGBNd dI8 x" }
-{ "s_name": "Supplier#000004975", "s_address": "GPq5PMKY6Wy" }
-{ "s_name": "Supplier#000005076", "s_address": "Xl7h9ifgvIHmqxFLgWfHK4Gjav BkP" }
-{ "s_name": "Supplier#000005195", "s_address": "Woi3b2ZaicPh ZSfu1EfXhE" }
-{ "s_name": "Supplier#000005256", "s_address": "Onc3t57VAMchm,pmoVLaU8bONni9NsuaM PzMMFz"
}
-{ "s_name": "Supplier#000005257", "s_address": "f9g8SEHB7obMj3QXAjXS2vfYY22" }
-{ "s_name": "Supplier#000005300", "s_address": "gXG28YqpxU" }
-{ "s_name": "Supplier#000005323", "s_address": "tMCkdqbDoyNo8vMIkzjBqYexoRAuv,T6 qzcu" }
-{ "s_name": "Supplier#000005386", "s_address": "Ub6AAfHpWLWP" }
-{ "s_name": "Supplier#000005426", "s_address": "9Dz2OVT1q sb4BK71ljQ1XjPBYRPvO" }
-{ "s_name": "Supplier#000005465", "s_address": "63cYZenZBRZ613Q1FaoG0,smnC5zl9" }
-{ "s_name": "Supplier#000005484", "s_address": "saFdOR qW7AFY,3asPqiiAa11Mo22pCoN0BtPrKo"
}
-{ "s_name": "Supplier#000005505", "s_address": "d2sbjG43KwMPX" }
-{ "s_name": "Supplier#000005506", "s_address": "On f5ypzoWgB" }
-{ "s_name": "Supplier#000005631", "s_address": "14TVrjlzo2SJEBYCDgpMwTlvwSqC" }
-{ "s_name": "Supplier#000005642", "s_address": "ZwKxAv3V40tW E8P7Qwu,zlu,kPsL" }
-{ "s_name": "Supplier#000005686", "s_address": "f2RBKec2T1NIi7yS M" }
-{ "s_name": "Supplier#000005730", "s_address": "5rkb0PSews HvxkL8JaD41UpnSF2cg8H1" }
-{ "s_name": "Supplier#000005736", "s_address": "2dq XTYhtYWSfp" }
-{ "s_name": "Supplier#000005737", "s_address": "dmEWcS32C3kx,d,B95 OmYn48" }
-{ "s_name": "Supplier#000005797", "s_address": ",o,OebwRbSDmVl9gN9fpWPCiqB UogvlSR" }
-{ "s_name": "Supplier#000005875", "s_address": "lK,sYiGzB94hSyHy9xvSZFbVQNCZe2LXZuGbS" }
-{ "s_name": "Supplier#000005974", "s_address": "REhR5jE,lLusQXvf54SwYySgsSSVFhu" }
-{ "s_name": "Supplier#000006059", "s_address": "4m0cv8MwJ9yX2vlwI Z" }
-{ "s_name": "Supplier#000006065", "s_address": "UiI2Cy3W4Tu5sLk LuvXLRy6KihlGv" }
-{ "s_name": "Supplier#000006093", "s_address": "KJNUg1odUT2wtCS2s6PrH3D6fd" }
-{ "s_name": "Supplier#000006099", "s_address": "aZilwQKYDTVPoK" }
-{ "s_name": "Supplier#000006109", "s_address": "rY5gbfh3dKHnylcQUTPGCwnbe" }
-{ "s_name": "Supplier#000006217", "s_address": "RVN23SYT9jenUeaWGXUd" }
-{ "s_name": "Supplier#000006297", "s_address": "73VRDOO56GUCyvc40oYJ" }
-{ "s_name": "Supplier#000006435", "s_address": "xIgE69XszYbnO4Eon7cHHO8y" }
-{ "s_name": "Supplier#000006463", "s_address": "7 wkdj2EO49iotley2kmIM ADpLSszGV3RNWj" }
-{ "s_name": "Supplier#000006478", "s_address": "bQYPnj9lpmW3U" }
-{ "s_name": "Supplier#000006521", "s_address": "b9 2zjHzxR" }
-{ "s_name": "Supplier#000006642", "s_address": "N,CUclSqRLJcS8zQ" }
-{ "s_name": "Supplier#000006659", "s_address": "iTLsnvD8D2GzWNUv kRInwRjk5rDeEmfup1" }
-{ "s_name": "Supplier#000006669", "s_address": "NQ4Yryj624p7K53" }
-{ "s_name": "Supplier#000006748", "s_address": "rC,2rEn8gKDIS5Q0dJEoiF" }
-{ "s_name": "Supplier#000006761", "s_address": "n4jhxGMqB5prD1HhpLvwrWStOLlla" }
-{ "s_name": "Supplier#000006808", "s_address": "HGd2Xo 9nEcHJhZvXjXxWKIpApT" }
-{ "s_name": "Supplier#000006858", "s_address": "fnlINT885vBBhsWwTGiZ0o22thwGY16h GHJj21"
}
-{ "s_name": "Supplier#000006946", "s_address": "To6Slo0GJTqcIvD" }
-{ "s_name": "Supplier#000006949", "s_address": "mLxYUJhsGcLtKe ,GFirNu183AvT" }
-{ "s_name": "Supplier#000007072", "s_address": "2tRyX9M1a 4Rcm57s779F1ANG9jlpK" }
-{ "s_name": "Supplier#000007098", "s_address": "G3j8g0KC4OcbAu2OVoPHrXQWMCUdjq8wgCHOExu"
}
-{ "s_name": "Supplier#000007132", "s_address": "xonvn0KAQIL3p8kYk HC1FSSDSUSTC" }
-{ "s_name": "Supplier#000007135", "s_address": "ls DoKV7V5ulfQy9V" }
-{ "s_name": "Supplier#000007147", "s_address": "Xzb16kC63wmLVYexUEgB0hXFvHkjT5iPpq" }
-{ "s_name": "Supplier#000007160", "s_address": "TqDGBULB3cTqIT6FKDvm9BS4e4v,zwYiQPb" }
-{ "s_name": "Supplier#000007169", "s_address": "tEc95D2moN9S84nd55O,dlnW" }
-{ "s_name": "Supplier#000007278", "s_address": "I2ae3rS7KVF8GVHtB" }
-{ "s_name": "Supplier#000007365", "s_address": "51xhROLvQMJ05DndtZWt" }
-{ "s_name": "Supplier#000007398", "s_address": "V8eE6oZ00OFNU," }
-{ "s_name": "Supplier#000007402", "s_address": "4UVv58ery1rjmqSR5" }
-{ "s_name": "Supplier#000007448", "s_address": "yhhpWiJi7EJ6Q5VCaQ" }
-{ "s_name": "Supplier#000007458", "s_address": "BYuucapYkptZl6fnd2QaDyZmI9gR1Ih16e" }
-{ "s_name": "Supplier#000007477", "s_address": "9m9j0wfhWzCvVHxkU,PpAxwSH0h" }
-{ "s_name": "Supplier#000007509", "s_address": "q8,V6LJRoHJjHcOuSG7aLTMg" }
-{ "s_name": "Supplier#000007561", "s_address": "rMcFg2530VC" }
-{ "s_name": "Supplier#000007616", "s_address": "R IovIqzDi3,QHnaqZk1xS4hGAgelhP4yj" }
-{ "s_name": "Supplier#000007760", "s_address": "JsPE18PvcdFTK" }
-{ "s_name": "Supplier#000007801", "s_address": "69fi,U1r6enUb " }
-{ "s_name": "Supplier#000007865", "s_address": "5cDGCS,T6N" }
-{ "s_name": "Supplier#000007885", "s_address": "u3sicchh5ZpyTUpN1cJKNcAoabIWgY" }
-{ "s_name": "Supplier#000007926", "s_address": "ErzCF80K9Uy" }
-{ "s_name": "Supplier#000007998", "s_address": "LnASFBfYRFOo9d6d,asBvVq9Lo2P" }
-{ "s_name": "Supplier#000008090", "s_address": "eonbJZvoDFYBNUinYfp6yERIg" }
-{ "s_name": "Supplier#000008224", "s_address": "TWxt9f,LVER" }
-{ "s_name": "Supplier#000008231", "s_address": "IK7eGw Yj90sTdpsP,vcqWxLB" }
-{ "s_name": "Supplier#000008243", "s_address": "2AyePMkDqmzVzjGTizXthFLo8h EiudCMxOmIIG"
}
-{ "s_name": "Supplier#000008323", "s_address": "75I18sZmASwm POeheRMdj9tmpyeQ,BfCXN5BIAb"
}
-{ "s_name": "Supplier#000008366", "s_address": "h778cEj14BuW9OEKlvPTWq4iwASR6EBBXN7zeS8"
}
-{ "s_name": "Supplier#000008532", "s_address": "Uc29q4,5xVdDOF87UZrxhr4xWS0ihEUXuh" }
-{ "s_name": "Supplier#000008595", "s_address": "MH0iB73GQ3z UW3O DbCbqmc" }
-{ "s_name": "Supplier#000008610", "s_address": "SgVgP90vP452sUNTgzL9zKwXHXAzV6tV" }
-{ "s_name": "Supplier#000008683", "s_address": "gLuGcugfpJSeGQARnaHNCaWnGaqsNnjyl20" }
-{ "s_name": "Supplier#000008705", "s_address": "aE,trRNdPx,4yinTD9O3DebDIp" }
-{ "s_name": "Supplier#000008742", "s_address": "HmPlQEzKCPEcTUL14,kKq" }
-{ "s_name": "Supplier#000008841", "s_address": "I 85Lu1sekbg2xrSIzm0" }
-{ "s_name": "Supplier#000008872", "s_address": "8D 45GgxJO2OwwYP9S4AaXJKvDwPfLM" }
-{ "s_name": "Supplier#000008879", "s_address": "rDSA,D9oPM,65NMWEFrmGKAu" }
-{ "s_name": "Supplier#000008967", "s_address": "2kwEHyMG 7FwozNImAUE6mH0hYtqYculJM" }
-{ "s_name": "Supplier#000008972", "s_address": "w2vF6 D5YZO3visPXsqVfLADTK" }
-{ "s_name": "Supplier#000009032", "s_address": "qK,trB6Sdy4Dz1BRUFNy" }
-{ "s_name": "Supplier#000009043", "s_address": "57OPvKH4qyXIZ7IzYeCaw11a5N1Ki9f1WWmVQ," }
-{ "s_name": "Supplier#000009278", "s_address": "RqYTzgxj93CLX 0mcYfCENOefD" }
-{ "s_name": "Supplier#000009326", "s_address": "XmiC,uy36B9,fb0zhcjaagiXQutg" }
-{ "s_name": "Supplier#000009430", "s_address": "igRqmneFt " }
-{ "s_name": "Supplier#000009549", "s_address": "h3RVchUf8MzY46IzbZ0ng09" }
-{ "s_name": "Supplier#000009601", "s_address": "51m637bO,Rw5DnHWFUvLacRx9" }
-{ "s_name": "Supplier#000009709", "s_address": "rRnCbHYgDgl9PZYnyWKVYSUW0vKg" }
-{ "s_name": "Supplier#000009753", "s_address": "wLhVEcRmd7PkJF4FBnGK7Z" }
-{ "s_name": "Supplier#000009799", "s_address": " 4wNjXGa4OKWl" }
-{ "s_name": "Supplier#000009811", "s_address": "E3iuyq7UnZxU7oPZIe2Gu6" }
-{ "s_name": "Supplier#000009812", "s_address": "APFRMy3lCbgFga53n5t9DxzFPQPgnjrGt32" }
-{ "s_name": "Supplier#000009846", "s_address": "57sNwJJ3PtBDu,hMPP5QvpcOcSNRXn3PypJJrh" }
-{ "s_name": "Supplier#000009899", "s_address": "7XdpAHrzr1t,UQFZE" }
-{ "s_name": "Supplier#000009974", "s_address": "7wJ,J5DKcxSU4Kp1cQLpbcAvB5AsvKT" }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index 1e1e47b..019ad04 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -548,9 +548,5 @@
       <artifactId>hadoop-minicluster</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/AwsNode.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/AwsNode.java
b/asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/AwsNode.java
deleted file mode 100644
index fb45643..0000000
--- a/asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/AwsNode.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.asterixdb.aws;
-
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-/**
- * The useful information for an AWS node.
- */
-public class AwsNode {
-
-    private final String privateIp;
-    private final String dnsName;
-
-    public AwsNode(ObjectNode node) {
-        this.privateIp = node.get("private_ip").asText();
-        this.dnsName = node.get("dns_name").asText();
-    }
-
-    public String getPrivateIp() {
-        return privateIp;
-    }
-
-    public String getDnsName() {
-        return dnsName;
-    }
-}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/ConfigGenerator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/ConfigGenerator.java
b/asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/ConfigGenerator.java
deleted file mode 100644
index 25895e8..0000000
--- a/asterixdb/asterix-server/src/main/java/org/apache/asterixdb/aws/ConfigGenerator.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.asterixdb.aws;
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-/**
- * This class is the binary that automatically generates :
- * 1. an Ansible inventory file for the AWS cluster;
- * 2. an AsterixDB configuration file for the AWS cluster
- * from a JSON description file returned by the Ansible AWS startup script.
- */
-public class ConfigGenerator {
-
-    private ConfigGenerator() {
-    }
-
-    public static void main(String[] args) throws Exception {
-        if (args.length < 3) {
-            System.err.println("The usage of ConfigGenerator: ");
-            System.err.println("<input node json file> <output inventory file>
<output config file>");
-            System.exit(0);
-        }
-        String source = args[0];
-        String inventory = args[1];
-        String config = args[2];
-
-        // Read Json file data to String
-        byte[] jsonData = Files.readAllBytes(Paths.get(source));
-
-        // Get a list of cluster nodes
-        ObjectMapper objectMapper = new ObjectMapper();
-        ObjectNode root = (ObjectNode) objectMapper.readTree(jsonData);
-        ArrayNode nodes = (ArrayNode) root.get("tagged_instances");
-        Iterator<JsonNode> nodeIterator = nodes.iterator();
-        List<AwsNode> cluster = new ArrayList<>();
-        while (nodeIterator.hasNext()) {
-            ObjectNode node = (ObjectNode) nodeIterator.next();
-            cluster.add(new AwsNode(node));
-        }
-
-        if (cluster.isEmpty()) {
-            return;
-        }
-
-        // Generates inventory file.
-        generateInventoryFile(cluster, inventory);
-
-        // Generates asterixdb config
-        generateConfig(cluster, config);
-    }
-
-    private static void generateInventoryFile(List<AwsNode> cluster, String inventoryPath)
throws IOException {
-        Iterator<AwsNode> nodeIterator = cluster.iterator();
-        try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(inventoryPath))))
{
-            // Prints the cc section
-            writer.println("[cc]");
-            String masterIp = nodeIterator.next().getDnsName();
-            writer.println(masterIp);
-            writer.println();
-
-            // Prints the nc section
-            writer.println("[ncs]");
-            writer.println(masterIp); // There is a NC that co-locates with CC.
-            while (nodeIterator.hasNext()) {
-                writer.println(nodeIterator.next().getDnsName());
-            }
-            writer.println();
-
-            // Prints the user
-            writer.println("[all:vars]");
-            writer.println("ansible_ssh_user=ec2-user");
-        }
-    }
-
-    private static void generateConfig(List<AwsNode> cluster, String configPath) throws
IOException {
-        Iterator<AwsNode> nodeIterator = cluster.iterator();
-        try (PrintWriter writer = new PrintWriter(new OutputStreamWriter(new FileOutputStream(configPath))))
{
-            // Prints the cc section
-            writer.println("[cc]");
-            String masterIp = nodeIterator.next().getPrivateIp();
-            writer.println("cluster.address=" + masterIp);
-            writer.println();
-
-            // Prints the nc section
-            writer.println("[nc/1]");
-            writer.println("address=" + masterIp); // There is a NC that co-locates with
CC.
-            int ncCounter = 2;
-            while (nodeIterator.hasNext()) {
-                writer.println("[nc/" + ncCounter++ + "]");
-                writer.println("address=" + nodeIterator.next().getPrivateIp());
-                writer.println();
-            }
-
-            // Prints the nc parameter section.
-            writer.println("[nc]");
-            String rootDirectory = "/home/ec2-user/";
-            writer.println("txnlogdir=" + rootDirectory + "txnlog");
-
-            // TODO(yingyi): figure out how to get device mapping for SSD-based instances.
-            writer.println("iodevices=" + rootDirectory + "iodevice");
-            writer.println("command=asterixnc");
-            writer.println();
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/src/main/opt/aws/README
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/opt/aws/README b/asterixdb/asterix-server/src/main/opt/aws/README
index b071ca2..52d503a 100644
--- a/asterixdb/asterix-server/src/main/opt/aws/README
+++ b/asterixdb/asterix-server/src/main/opt/aws/README
@@ -45,6 +45,7 @@ To start an AWS cluster, you need to do the following steps:
    ansible: pip install ansible
    boto: pip install boto
    boto3: pip install boto3
+   Make sure that the version of ansible is no less than 2.2.1.0.
 
 6. Launch your cluster instance on AWS:
    bin/start.sh

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml b/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
index 3deab82..645f68f 100644
--- a/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
+++ b/asterixdb/asterix-server/src/main/opt/aws/ansible/aws_start.yml
@@ -20,6 +20,11 @@
 - name: Start AWS cluster
   hosts: localhost
   gather_facts: false
+  vars:
+     temp_dir: "/tmp/asterixdb"
+     inventory: "{{ temp_dir }}/inventory"
+     ccconf: "{{ temp_dir }}/cc.conf"
+     home_dir: "/home/{{ user }}"
   tasks:
     - include_vars: ../conf/aws_settings.yml
     - name: Launch all instances
@@ -38,11 +43,66 @@
         instance_tags:
             Name: "{{ tag }}"
       register: ec2
+
     - name: Create local temporary directory
       file:
-        path: /tmp/asterixdb
+        path: "{{ temp_dir }}"
         state: directory
-        mode: 0755
-    - name: Output the information of all nodes
-      local_action: copy content="{{ ec2|to_json }}" dest=/tmp/asterixdb/nodes
 
+    - name: Set CC node
+      set_fact:
+        cc: "{{ ec2.instances[0] }}"
+
+    - name: Populate CC to the cluster inventory file {{ inventory }}
+      shell: printf "[cc]\n{{ cc.public_dns_name }}\n" > "{{ inventory }}"
+
+    - name: Start the NC section in the cluster inventory file {{ inventory }}
+      shell: printf "\n[ncs]\n" >> "{{ inventory }}"
+
+    - name: Populate CC to the NC section (if needed) in the cluster configuration file "{{
ccconf }}"
+      shell: printf "[cc]\n{{ cc.private_ip }}\n\n" > "{{ ccconf }}"
+      when: cc_on_nc
+
+    - name: Populate NCs to the cluster inventory file {{ inventory }}
+      shell: printf "{{ node.1.public_dns_name }}\n" >> "{{ inventory }}"
+      when: node.0 != 0
+      with_indexed_items: "{{ ec2.instances }}"
+      loop_control:
+        loop_var: node
+
+    - name: Populate NCs to the cluster inventory file {{ inventory }}
+      shell: printf "\n[all:vars]\nansible_ssh_user={{ user }}\n" >> "{{ inventory
}}"
+
+    - name: Populate CC to the cluster configuration file "{{ ccconf }}"
+      shell: printf "[cc]\ncluster.address={{ cc.private_ip }}\n\n" > "{{ ccconf }}"
+
+    - name: Populate NCs to the cluster configuration file
+      shell: printf "[nc/1]\naddress={{ cc.private_ip }}\n\n" >> "{{ ccconf }}"
+      when: cc_on_nc
+
+    - set_fact:
+        start: 0
+
+    - set_fact:
+        start: 1
+      when: cc_on_nc
+
+    - name: Populate NCs to the cluster configuration file
+      shell: printf "[nc/{{ node.0 + start }}]\naddress={{ node.1.private_ip }}\n\n" >>
"{{ ccconf }}"
+      when: node.0 != 0
+      with_indexed_items: "{{ ec2.instances }}"
+      loop_control:
+        loop_var: node
+
+    - name: Populate the NC txnlogdir to the cluster configuration file {{ ccconf }}
+      shell: printf "[nc]\ntxnlogdir={{ home_dir }}/txnlog\n" >> "{{ ccconf }}"
+
+    - name: Populate NC iodevices to the cluster configuration file {{ ccconf }}
+      shell: printf "iodevices={{ home_dir }}/iodevice\n" >> "{{ ccconf }}"
+
+    - name: Populate the NC command to the cluster configuration file {{ ccconf }}
+      shell: printf "command=asterixnc\n" >> "{{ ccconf }}"
+
+    - name: Wait for SSH to come up
+      wait_for: host="{{ item.public_ip }}" port=22  search_regex=OpenSSH delay=0 timeout=300
state=started
+      with_items: "{{ ec2.instances }}"

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml b/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
index 27554a9..e71066c 100644
--- a/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
+++ b/asterixdb/asterix-server/src/main/opt/aws/ansible/instance_start.yml
@@ -17,9 +17,10 @@
 # under the License.
 # ------------------------------------------------------------
 
-- hosts: ncs
+- hosts: all
   tasks:
     - include_vars: ../conf/instance_settings.yml
+
     - name: Download JDK
       shell: "wget -q --tries=5 --no-cookies --no-check-certificate --header \
               \"Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie\"
\
@@ -32,11 +33,17 @@
       synchronize:
           src: "{{ dist }}"
           dest: "{{ binarydir }}"
+          archive: true
 
     - name: Ensure the log directory exists
       file:
-          path: "{{ binarydir }}/logs"
-          state: directory
+        path: "{{ binarydir }}/logs"
+        state: directory
+
+- hosts: ncs
+  tasks:
+    - include_vars: ../conf/instance_settings.yml
+
 
     - name: Ensure the io device directory exit
       file:
@@ -51,6 +58,7 @@
 - hosts: cc
   tasks:
     - include_vars: ../conf/instance_settings.yml
+
     - name: Copy cluster config to CC
       synchronize:
         src: /tmp/asterixdb/cc.conf

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh b/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
index eebdb9c..2627a09 100755
--- a/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
+++ b/asterixdb/asterix-server/src/main/opt/aws/bin/start.sh
@@ -32,12 +32,6 @@ ansible-playbook -i "localhost," $AWS_PATH/ansible/aws_start.yml
 # Generates an Ansible inventory file and an AsterixDB configuration file.
 temp=/tmp/asterixdb
 inventory=$temp/inventory
-conf=$temp/cc.conf
-java -cp "${DIST_PATH}/repo/*" org.apache.asterixdb.aws.ConfigGenerator $temp/nodes $inventory
$conf
-
-# Waits a while so that all instances are up and running.
-# TODO(yingyi) pull the "status check" field of each instance.
-sleep 90
 
 # Installs asterixdb on all AWS instances.
 export ANSIBLE_HOST_KEY_CHECKING=false

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml b/asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
index 06a7d27..ed78342 100644
--- a/asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
+++ b/asterixdb/asterix-server/src/main/opt/aws/conf/aws_settings.yml
@@ -43,4 +43,10 @@ secret_access_key: <to be filled>
 instance_type: t2.micro
 
 # The number of ec2 instances that construct a cluster.
-count: 2
+count: 3
+
+# The user name.
+user: ec2-user
+
+# Whether to reuse one nc machine to host cc.
+cc_on_nc: false

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml b/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
index d2a9ace..cc517b2 100644
--- a/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
+++ b/asterixdb/asterix-server/src/main/opt/aws/conf/instance_settings.yml
@@ -36,7 +36,7 @@ basedir: /home/ec2-user
 binarydir: "{{ basedir }}/{{ product }}"
 
 # The full binary distribution directory.
-dist: "../../../"
+dist: "../../../../"
 
 # The nc service command (script).
 ncservice: "{{ binarydir}}/bin/{{ ncsbin }}"

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/73715d87/asterixdb/pom.xml
----------------------------------------------------------------------
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 57488bc..7cb0e5b 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -656,6 +656,7 @@
     <module>asterix-yarn</module>
     <module>asterix-replication</module>
     <module>asterix-experiments</module>
+    <module>asterix-benchmark</module>
     <module>asterix-coverage</module>
     <module>asterix-active</module>
     <module>asterix-client-helper</module>


Mime
View raw message