From 33dbff74d546d5c99cfbc2bf2c9305fed3314f34 Mon Sep 17 00:00:00 2001 From: martji Date: Mon, 1 Sep 2014 15:01:08 +0800 Subject: [PATCH] 1. fix interface in *Server.java 2. fix the experience.jsp page 2.1. delete 2 unuseful paras 2.2. add Throughput chart 2.3. add select to choose the rate 3. bug fix --- .../classes/dao/MemcachedServer$bench.class | Bin 3242 -> 3232 bytes .../WEB-INF/classes/dao/MemcachedServer.class | Bin 6207 -> 6327 bytes .../classes/dao/RMemcachedServer$bench.class | Bin 2701 -> 2701 bytes .../classes/dao/RMemcachedServer.class | Bin 9731 -> 9728 bytes .../WebRoot/WEB-INF/classes/dbcfg.properties | 5 + .../classes/servlets/GetInfoServlet$1.class | Bin 807 -> 807 bytes .../classes/servlets/GetInfoServlet$2.class | Bin 806 -> 806 bytes .../classes/servlets/GetInfoServlet.class | Bin 4111 -> 4968 bytes Website/WebRoot/css/memcache.css | 16 +++- Website/WebRoot/experience.jsp | 87 ++++++++++++------ Website/src/dao/MemcachedServer.java | 20 ++-- Website/src/dao/RMemcachedServer.java | 22 +++-- Website/src/dbcfg.properties | 5 + Website/src/servlets/GetInfoServlet.java | 54 ++++++++--- 14 files changed, 152 insertions(+), 57 deletions(-) create mode 100644 Website/WebRoot/WEB-INF/classes/dbcfg.properties create mode 100644 Website/src/dbcfg.properties diff --git a/Website/WebRoot/WEB-INF/classes/dao/MemcachedServer$bench.class b/Website/WebRoot/WEB-INF/classes/dao/MemcachedServer$bench.class index 92f1e31ad428c6706153f904ee58cb69b1b493ea..fd0c6ed0a108ea305e3e834c7a71ab964f76f25b 100644 GIT binary patch delta 279 zcmZvVy-NaN0EeG9FYp5k>L3pSIV!koIhyuA%}iTU_MAOwCu8X!MIRV4 z%!z-P6Y8FI=^H3y@sOj3P5Q~BQ6R_`!#IpmOt;)6vxJ*%{FLcq2bBr|s_5)uQo~}8 z5c`aC;AA~1u~?VFhLjyLNE3q=V;m9Ym#7r$(Klbh4TsU}0l#%{ixRPBROVQg$|0nzFEvq|uB^ zIG9@<#{CkKyF^p`0E=1k{Q;}@?d|F5U6gsbS<_^~PI;E+x}#%h6`nmb;ySKlIm4N{ zrpFD#9QY6Ldz#XX`U)CLgjuGA9PQ+htkTIE3D)UmBNK!Q<`yBgX~w6G9b)X#!5%sV zOo~{PNK&ScioXz^5L1B??km{=ajF;`(#sM395cuXHm9UGW1Mp)xnP=0X1HROYv#Ej y%dNU{r^NSEcp%_Wtxvr2%r`ImsP@a7Xy9E$`4FvqiWoH^sfsSXF#Ne_MEn7MyH?Tw diff --git a/Website/WebRoot/WEB-INF/classes/dao/MemcachedServer.class b/Website/WebRoot/WEB-INF/classes/dao/MemcachedServer.class index b0d098cc67e3fe1e8eb876a21821cb92d57a59b2..89f5e31a0a4bf885af00e6c242d0a52c1db1b665 100644 GIT binary patch literal 6327 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 literal 6207 zcma)A33yc175;B#ChyJ5V+$EDBtcNH$$%LWFk)Dg5Rie80E5^_Ext^i$>3yWn0W)l z*1BQcTdS>IzAj>I>0S+W5~Q_SyVA|CtzGTDZ??6&woU)@-XxikSj$J=z4zRE&pr2? z|15V-{pXQK0jyLp4HXJ=`>k|jyFC=Q;)8a7%+4OPvl{#gv-evEtw_>J4MckS_Sq zwp$tQ52n)nc5$|*E1eyP?9ZiBk*%?w?hV^W75jyy3$s^omHqU+gLKSM#mBb7&r%w8eT>YQ~EDiW}*pUYKiQ3*|~H+8>cqT zYAg|^Xsn`qDcgx$va5@-El0D4a}`XNZ;@^yf)!LH+3m2L!53bv$SVkiRuchKYFJgK zByWL^HtN3Rg4X7iw$;rmn_F8~wYRQVv7$xC>hg&dlN0Ub6RRdC)|OAStoB%m4C_s3 z&^277Fvq=x3#~0yZjkUYa3MNOY{Yy5Vy$ar*|W(+5Qc_}3F*@TXJ9irWZ6~|RWPO3 zWnuy9aqsiRy40RDA$mQ6yh9b z^W^2XvI9I(6YVCfqy{2-{uE9Nn+i=N;sm7yuvx90QJJnno^wr7lP-k>{a??3}L;wBA86qX8ftc(QFh8y#@is-?3k;cGs z3vSbJtHPP_^iX8Tww-*2O)(rtV(Iu*(ViWQR3>i69iCrDQw(P*@$0i0EM8(C1-}Ka zGx2&c62r6Og?Osu7QDg4-MEKLNsiKD6jf~47;V}k({D0yuT0CX?TM7k3i&N2-a1LP z4huQJgd+b8nSY0gcj8?PiL#9db7D!`&IsSF9^a!T?#H{SMlR^K1_Z-?x`2D;drZ7n z9MmWxC~>vSW~cy##s9}$6+U1hgZTzNgpX+WaG3)}8Eyw`TH&L3kjH1NY|bX_MX(e# zFoKV1I9?XeI@5W2nTdx{pyFH>9_dB6bPCMJ1hXd;0*!k+9bSuK?A4oWx4oQ6qYweqtVl@xMrHb z(<%Bnh0jkwsz#FL*G+swAQi|7lni_m-`4Ogg@se0MQoeR<};4nzv*z?&NvCV;&(*a zSs7L*qPO@}yR%lDPN(oa6HmKyl7_w1?J72iAK*tCepqJn*l^CV8R&kDpD@s+^MV-f zGKn<(+-1(1WQaQY8GfPR=gd&9WaZN)eu-Z(IJ)8_>1kylY$ED0g#CsxXYB)dJLhp^obA0#j`Z8Tw+l6GeS#4 zmeS-r*J51aD%B|$>)X%xzL$wZG0+Fx{KSP<*~46~`V{J>OC+ALnNAe>EGn__bQa;V z8LlCikKIh=rt9Y!Hk4*6T}0P&gL$VjeJG_VV;U$+l{!_gZcHXvbQvm0hf+Z`!&EcX zEDxVj_br(=wRtj5`VH?q#MpSw^wDLqH1>|-1$2Vn$?*bJsz%MzRET$)DmF+r@pn8U zlV_N!RxO}r39^^YaYX>=s-9Mh5B2ZkE?u#`hYNQKPkrp{vORA)>2E(;!_ zb;h_ga{f|NougPO`Z5C9)us8acvy+KCh&JUNmsSHVom9z48);YE^JvSE-f;g)MV52 z6}z6Y54q08+LGPwsS@AhTcBiERlM~+k{MiO#3M^a)W|+^D4BCd^U5or;fz-WDYTWF zdTq(wiWNf%WkPf7Y2zSIV)@M1gD7~~dj(ZHc4>->>)miWoU@ZxM!fe=k6dHLj_P7%$37Pj5!Hc8IPwN|-K@bkbC1o4f~-p*Ar%s?8H2$gMml zBchZ)@{Xc!=q!SYZzj!}xNE4~g2jU-!(BNu@dYa$=RKE5QB>@}-Qlk-KBo<8I4p z+@-S?cgL*6-7#xuw`B#*)+CpCm{0y^aP%B>f3@kbfF%5_|Ci>3-L;q z11LNnGQ}%I*z#$JKzJ1UrjDp|iPi2F(_4TmU~yp(eTb7H_wV8TW%FX)yKcW+_e!}g zKb6&kv0klue{2lNDaHoxzztZ0vr3pRM!IMo)?Y>D-=ztKxpNW+dPmSQhTJF)Ru32O zssgSZ!wqA&d0Th{>k7CttQT;XeBKzI-CDq#!!>wY0dEic3b-#^zyqS&>Gb~6y6)iP z4171AfktYw31=hB-ZGp^ZLj3F9nE|jMySyiT#Q!iBy}%V!Nz$=(i%COKY7o3yd1~y zKJp97!^gX4#oZhcYN~n+?+^Q0$MC_mVZSu%!U1X4hbyIN^M^II4_y$bBUnQIkL&H4 zuT4LO8MRtSpWU+ih^|6<$bWSF*^|Uxtu~6$cD;dyX%G6^jAK|(8w?qu%TYWMG730J zEyj)*Dr7Vq9sk7`9wj2j@Tmem=XY_p*WI=7Bu@3#H-wB@y*7A8U=&|!ud1yo;H&P= zx})PiIfl74cybJ1I|ifOs3qs8MzHN|dLN>O9%1$R1dBGGi~PH>gxYK8Xf54%9X((@Eps8!bP=tx zfi~Gl8+2kdHj&ziC~dNvesCFkS70j~w%1@gpI+U#mGHfb_PQ6l@P5Sb5%x#vE054h zkD(Wz;jU90KgpB7P8&W=4nL<0{0@CerxCxwKk!e6s8;-l^Uw1ai1X;j|KhApxgW*98N77LF^2!J z4N{Ut?yP}(s0mqTQ1$@E=_pl{IG~iOfT1M#wIeuAMd+IHld6203UC!^4gASsil$+u zjDUFy7d!`ji-vDjk}FF=51&}WmeUBj{#HM;T~`G z6eX$R?9;^Yw(toxm!;2rcyhA$S>M`YI3dxZuJwePUxCL|&Gr#=mJzzoovZ4+S*&zj zj)aC%LSXp|R#cKuwn7V4hW!0)dPoZe`rCrVpd)@USDjfmrWT)2OMJLghK(V;Y}^zI zPLAm{^dzAaC8he5aKuDb2vg+AHw%=v#a3@b?3*oRWtPpCXUBlXz}TV2ULW# z3UayyU%< vt?UUbU_P1h>C?A#Pne+ekeyRL>+PtYIE4P$BLb)$YA0Lq)KgGu7mWV`9m%=X diff --git a/Website/WebRoot/WEB-INF/classes/dao/RMemcachedServer$bench.class b/Website/WebRoot/WEB-INF/classes/dao/RMemcachedServer$bench.class index 913a04fcafcd0f83828d80d2b7917bb3bead1435..39386f49bca0ae712a06f628371cade66fdb7a44 100644 GIT binary patch delta 187 zcmWN}y-Gp>0D#f&1JirWZejOY{uGr~dZ7mQ)>>R0dfkf_^u6a|DciqsI$ESQcx}~oY1KlxHz?VY4 abx*1a6IGe2&aWb7ikY9Eg_7RH9-jcw#3B;_ diff --git a/Website/WebRoot/WEB-INF/classes/dao/RMemcachedServer.class b/Website/WebRoot/WEB-INF/classes/dao/RMemcachedServer.class index 80d9cbe591064881bf1f8aaf162bf1cb79ad9aa2..5630c25662a7fb428f67fc694682366b726f8dc4 100644 GIT binary patch literal 9728 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 XUM_xz+Z4%PGMZd54 literal 9731 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 AssI20 diff --git a/Website/WebRoot/WEB-INF/classes/dbcfg.properties b/Website/WebRoot/WEB-INF/classes/dbcfg.properties new file mode 100644 index 0000000..9630ee7 --- /dev/null +++ b/Website/WebRoot/WEB-INF/classes/dbcfg.properties @@ -0,0 +1,5 @@ +url = jdbc:mysql://192.168.3.218:3306/tpcw +username = root +password = 1234 +sqlget = select c_id, c_uname, c_passwd, c_birthdate from customer where c_id = ? +sqlset = replace into customer(c_id, c_birthdaye) values(?, ?) \ No newline at end of file diff --git a/Website/WebRoot/WEB-INF/classes/servlets/GetInfoServlet$1.class b/Website/WebRoot/WEB-INF/classes/servlets/GetInfoServlet$1.class index dcd03f82e2431e4a0662e711029543402c47f3b9..7dc71396e0d57630b81518a50798ae484cbb0d4c 100644 GIT binary patch delta 23 fcmZ3^ww!Il8YafL$!nSHSrZx98ImS{WHJK)TT%xk delta 23 fcmZ3^ww!Il8YafT$!nSHSwk4u8A2z2WHJK)S=k2t diff --git a/Website/WebRoot/WEB-INF/classes/servlets/GetInfoServlet$2.class b/Website/WebRoot/WEB-INF/classes/servlets/GetInfoServlet$2.class index eed4c33cd76512ddd0449895fb9c59633d56ed55..bb53852c92fd1d0c91cad530963ab9656c751767 100644 GIT binary patch delta 23 fcmZ3+wv27VY9_{%$!nPGS<@NV88Rk+U@`*$Te1f+ delta 23 fcmZ3+wv27VY9_|;$!nPGS)&-(8KNhDU@`*$S~&*_ diff --git a/Website/WebRoot/WEB-INF/classes/servlets/GetInfoServlet.class b/Website/WebRoot/WEB-INF/classes/servlets/GetInfoServlet.class index 44776b56241ecade5e3804e447990de48d179c3d..e665660b91dcbacbdac6e788b478526c1ae0b183 100644 GIT binary patch delta 2562 zcmZuz4Rlo15&q^S?`L0L_}ToxN(hNU4W5!E&`{h|kDMbhbb)&0+>%T59!P0at-Z-+=OL@b$k&C14-Bf#oE|mMw5i1 z3Wq!esg)W!2~?%wR)V@Z5x*sAB{Y1QP3Kl#S*>9+OUbr)yM`@(5r~R!5PW<Qvu)~0iZxZ|!4Z9{yabA(92DV|R0KY|;QqeHxtGOcHzyo+t=teC|&{I(_ob1IzD)u?6l*^{?7p^9@ zCn7OBXq%z+%MxbD^5ENeM8(6-Ud5O5DALYhrCfOoPpEj@8CHr@2k~8ku{s`)T4rp8 z8SSu`mWtUcJ$OpkeUDHOHsk(AYeUEkwOQdHGa%UOBjndcVv%H987Ea<&NX|6psjHs zi|dv_lZt*ece9Vg{nv}YS`rc4N{HR(3>=0M;)K>jJCbbzdfvbbE*+t0JZW9XJ}gpr z*}xC*Lq350+qF@1E!WJA@ke4Kt>Gse4;Q7Z*-CaqZH`B0t0M+p#cR&%>g7wH!Vwie z=WybQwf=RceZ{U~ALwg6eUCsCc25rt_Z4LKd zVe0>Qs?qQ(_R^^1ZBdtB6N)d=T6}BBYPTctm^fyYNbH1xcknwdrybeA)Kh)#(%AY6 zvGbmR-{XCPCl(J|Tu_@kzp!Dzb$lRl zdq=~c`H)$a^Vg{O=%W6+FQ)3iRm%&Y;PcMWysLHjTByheqyvu6STIA{$k&|sox{sD{C=6`l0IDPt6cJ47{DeQWs2(fp;+I5q`D?`J4>y z8pO8NL3FiV;gkEZy&rdHuq%so3oO--d$V8~1%=I*bi~+bG%Py@a&un2KYUgrq8+7FS^!xK=#S5_4j*Gn)T6(qCULBK6+tXaCS^M zOZ}L=4dAB%c>q5PD1#Vk?Z@i@)u(!YA-o)GVd+f~&9Rm=^nm8mGI(o_PtD*r<0HV+ zefVvc_ube+xevnur4N5_pVU5_3}}P+fZhHv;PH99r@Vj4eF1-I&6&bS{xuaGz$ee) zKRIaOz5j}X&Sf7j*yuieoQ=vh<4klm;ebX>Mq2xc0(rhXpC?073$J>1Wu1UA$7hU- z`4DobIz=^fHTF`HHqmBYU!vpmCV$Q3Lg#+D0`=T6i&?IP7uVqu)S(7E_#dS?Fk;LCvi8O!cO`qg_bX z28zV>gCVY=D@{X*xPy#MM=2zfOLw4-WWJM?l1(XvR3>{R6_7?Ap6xfGk#xos&RwQF zGFaMjUXnSdt0*7u^K%9ZX#z_M=jW%1GzltaCoCpI<8;#Gr2>8)!2v21dYoDh6)~oA zg56Zim?jmcu$`vRRCqYc8_36!&Nr!jDUuFEW!lhQCa=|ZMN|*8KWn#N{6|e5>@;{HZj;{a! delta 1716 zcmYjRYj6`)6#j0T%_i%nKnhbLEjGiW1t}2`hY8~Yg;Ht@m6mqOI32gmwn<5|?e3-) zfd)jND2lkEE%*R@lo3%WkQOQw6@{YW0~OzZpduo^{=tBro5(rB> zf`Mik0v=%S>y7FLyrjHmGogIt|d%aw3c zWk}5(GtY?*o@hNodO*>9#cD&1QWI1IrK;Yn>JB{1;K~n0LPju~y7YRz4m{7`s7;vE zfP{^hEn*Xe*T*=YA^Z6t4V#2QBH!&Yy0C-6S*MzO!wNXE?%0JY5pf2$ zrq}uE4K3m;ES)`Ts;(;wc>W$4yRnC8HbV`>04uc3ipFN~47Ra5}Ktf%hoEsPPkPMI5v?IfrER;{y?g>6ES#pC8r~Q^tq*$U5pA zW&c>lC-~I5?3^hdmGL>gAod%hrd2H6HuP9>QcOd_E;#w$H{9i0t4~@t)2=64riQMW zw^EZRuA4&m^XX7|D@r6l!(kePA?cR@PN2z2;4~OkhFqP36V^gm6Ea~#mUWYBh-Gu- z2qQ=vMOvY73+$L=#ay>bsT~j@0j%FT=(;tBwbQ&ZTKurilQ@AE*%J1VU6|%BjHAe5 zWv0!Ikrs#6i>At67?oo^LN}t_Xo+KC($<=^ElJuskv>Zqtd8T! zj(^W~p*mgrBa+=4!PO&|B zGmf2pA&+}qlcT;1-K*Tak;y_A-tyafvA?n#@AyTJ=ziCIz_u6fSEgnNJvda_gCo1~ zSt=@M>r0MwXHxCOE(-a|@9;Q0VmyYgD?AQf%9-bJUQ=p2Qg8~t;vCwTm*udrbjfX; zV;rF;3b>o(X>emYu17w+n1S&qKp6^gAMQaliV&m+Yz1b~D(-tcqSc1&dfc7Bda4tc9L43rpB$EM;5q5Zi%eY!8;R{q%|*z)BW7 zgw?o?`f0}i8jya-aFNEPVaVh|L{b)p6B}N(g*yBWsTj{TPzOH{AJud}k5eZCROgzqYn;3nGA8_ zEa8#C{`dNgM*SRF#v<(!%0z5rmyj;vcXkm|FJN+kh&KD63mBS`kkYa*qL$h?Pry=; wPH{HU22&2;Mq1YJ^dXbhB^aO*WS|?GU?2s5kd}f!@fUsFBpLMOzt-gEKV)08D*ylh diff --git a/Website/WebRoot/css/memcache.css b/Website/WebRoot/css/memcache.css index adef74a..db65c43 100644 --- a/Website/WebRoot/css/memcache.css +++ b/Website/WebRoot/css/memcache.css @@ -256,7 +256,7 @@ margin-left: 0; margin-bottom : 2px; } .paraitem { - width: 160px; + width: 180px; text-align:left; padding-top:8px; padding-left:8px; @@ -264,20 +264,28 @@ margin-left: 0; border-right:1px solid silver; } .parasinput { - width:80px; + width:100px; + font-size: 1em; + padding-left:2px; + font-family: Consolas, "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", Monaco, "Courier New", monospace; +} +.modeselect { + width:120px; + height:25px; font-size: 1em; font-family: Consolas, "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", Monaco, "Courier New", monospace; } .buttons { width: 300px; - float:left; + float:right; text-align:right; - margin-right:20px; + margin-right:40px; padding-top:8px; height:32px; } .parasbutton { width:120px; + margin-right:20px; text-align:center; font-size: 1em; font-family: Consolas, "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", Monaco, "Courier New", monospace; diff --git a/Website/WebRoot/experience.jsp b/Website/WebRoot/experience.jsp index 8d7f3e4..2e58e8b 100644 --- a/Website/WebRoot/experience.jsp +++ b/Website/WebRoot/experience.jsp @@ -50,26 +50,25 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
-
- +
+
- +
-
- - -
-
- - -
-
- - +
+ +
+
@@ -116,8 +115,13 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
-
Result
-
+
Delay
+
+
+
+
+
Throughput
+
@@ -182,15 +186,14 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. $('#time1').text("0.000"); var para1 = document.getElementById("para1").value; var para2 = document.getElementById("para2").value; - var para3 = document.getElementById("para3").value; - var para4 = document.getElementById("para4").value; - var para5 = document.getElementById("para5").value; - if (para1 == '' || para2 == '' || para3 == '' || para4 == '' || para5 == ''){ + var para3 = $('#para3').val(); + + if (para1 == '' || para2 == '' || para3 == ''){ alert("必须输入完整的参数！"); return; } - var paras= 'para1='+para1+'¶2='+para2+'¶3='+para3+'¶4='+para4+'¶5='+para5; - var url = "servlets/GetInfoServlet?"+paras; + var paras= 'para1='+para1+'¶2='+para2+'¶3='+para3; + var url = "servlets/GetInfoServlet?"+paras; xmlHttp.onreadystatechange = getResult; xmlHttp.open("POST",url,true); xmlHttp.send(null); @@ -280,12 +283,14 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. }); } function showBar(arrayObj){ - $('#chart1').html(''); + $('#chart1-1').html(''); + $('#chart1-2').html(''); $('#chart2').html(''); $('#chart3').html(''); if (arrayObj == null){ progresslength1 = 0; - var data1 = [[0,'Memcached'], [0,'R-Memcached']]; + var data1_1 = [[0,'Memcached'], [0,'R-Memcached']]; + var data1_2 = [[0,'Memcached'], [0,'R-Memcached']]; var innerdata2 = [['Node0000', 0], ['Node0001', 0], ['Node0002', 0], ['Node0003', 0]]; var innerdata3 = [['Node0000', 0], ['Node0001', 0], ['Node0002', 0], ['Node0003', 0]]; var data2 = [innerdata2, innerdata2]; @@ -296,7 +301,8 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. $('#time1').text(dataTime); progresslength1 = 180; - var data1 = [[dataTime*2,'Memcached'], [dataTime,'R-Memcached']]; + var data1_1 = [[dataTime*2,'Memcached'], [dataTime,'R-Memcached']]; + var data1_2 = [[dataTime*2,'Memcached'], [dataTime,'R-Memcached']]; var innerdata21 = [['Node0000', arrayObj[1]], ['Node0001', arrayObj[3]], ['Node0002', arrayObj[5]], ['Node0003', arrayObj[7]]]; var innerdata22 = [['Node0000', arrayObj[2]], ['Node0001', arrayObj[4]], @@ -306,7 +312,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. } jQuery.jqplot.config.enablePlugins = true; - var plot1 = $.jqplot('chart1', [data1], { + var plot1_1 = $.jqplot('chart1-1', [data1_1], { title:'R-Memcached VS Memcached', seriesDefaults: { pointLabels: {show: true}, @@ -327,7 +333,34 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. } }, xaxis: { - label: 'Time Cost', + label: 'Time Cost / ms', + labelRenderer: $.jqplot.CanvasAxisLabelRenderer + } + } + }); + + var plot1_2 = $.jqplot('chart1-2', [data1_2], { + title:'R-Memcached VS Memcached', + seriesDefaults: { + pointLabels: {show: true}, + shadow: false,showMarker: true, + renderer: $.jqplot.BarRenderer, + rendererOptions: { + barDirection: 'horizontal', barWidth: 60, barMargin:50 + } + }, + axes: { + yaxis: { + renderer: $.jqplot.CategoryAxisRenderer, + labelRenderer: $.jqplot.CanvasAxisLabelRenderer, + tickRenderer: $.jqplot.CanvasAxisTickRenderer, + tickOptions: { + fontFamily: 'Courier New', + fontSize: '12pt' + } + }, + xaxis: { + label: 'Throughout Capacity', labelRenderer: $.jqplot.CanvasAxisLabelRenderer } } diff --git a/Website/src/dao/MemcachedServer.java b/Website/src/dao/MemcachedServer.java index dd0f1d4..056b450 100644 --- a/Website/src/dao/MemcachedServer.java +++ b/Website/src/dao/MemcachedServer.java @@ -8,7 +8,7 @@ import java.util.Map; import java.util.Random; import com.meetup.memcached.*; -import com.meetup.memcaheded.db.DatabaseCon; +import com.myself.database.DatabaseCon; import com.myself.server.webSession; import org.apache.log4j.PropertyConfigurator; @@ -29,6 +29,8 @@ public class MemcachedServer { public static Boolean status = false; public static Boolean initFlag = false; + private static final int RESULTTHROLD = 500; + public static void main(String[] args) { MemcachedServer.run(new String[]{"10","1000","1000","64","0.8"}); } @@ -59,9 +61,9 @@ public class MemcachedServer { int threads = Integer.parseInt(args[0]); int runs = Integer.parseInt(args[1]); - int Nums = Integer.parseInt(args[2]); - int size = Integer.parseInt(args[3]); - double rate = Double.parseDouble(args[4]); + int Nums = 10000; + int size = 64; + double rate = Double.parseDouble(args[2]); threadCount = threads; byte[] obj = new byte[size]; @@ -75,7 +77,11 @@ public class MemcachedServer { } oldStats = getStats(); - DatabaseCon.getInstance().start(); + try { + DatabaseCon.getInstance().start(); + } catch (Exception e) { + DatabaseCon.getInstance().start(ORIGINPATH); + } MemcachedServer.initFlag = true; for (int i = 0; i < threads; i++) { @@ -138,7 +144,7 @@ public class MemcachedServer { JSONArray results = new JSONArray(); JSONArray arrays = webSession.results; int endIndex = arrays.length(); - for (int i = startIndex; i < endIndex && i < startIndex + 1000; i++){ + for (int i = startIndex; i < endIndex && i < startIndex + RESULTTHROLD; i++){ try { JSONObject aResult = (JSONObject) arrays.get(i); results.put(aResult); @@ -146,7 +152,7 @@ public class MemcachedServer { e.printStackTrace(); } } - startIndex = endIndex < startIndex+1000 ? endIndex : startIndex+1000; + startIndex = endIndex < startIndex+RESULTTHROLD ? endIndex : startIndex+RESULTTHROLD; return results; } diff --git a/Website/src/dao/RMemcachedServer.java b/Website/src/dao/RMemcachedServer.java index 7aa581f..7eb535f 100644 --- a/Website/src/dao/RMemcachedServer.java +++ b/Website/src/dao/RMemcachedServer.java @@ -46,6 +46,8 @@ public class RMemcachedServer { public static long time = 0; private static Map localStats = new HashMap<>(); public static JSONArray nodeStats = new JSONArray(); + + private static final int RESULTTHROLD = 500; public static void main(String[] args){ // for (int i = 0; i < 1; i++){ @@ -107,9 +109,9 @@ public class RMemcachedServer { int threads = Integer.parseInt(args[0]); int runs = Integer.parseInt(args[1]); - int Nums = Integer.parseInt(args[2]); - int size = Integer.parseInt(args[3]); - double rate = Double.parseDouble(args[4]); + int Nums = 10000; + int size = 64; + double rate = Double.parseDouble(args[2]); RMemcachedServer.threadCount = threads; RMemcachedServer.requestCount = runs*threads; @@ -124,7 +126,11 @@ public class RMemcachedServer { } getStats(); - DatabaseCon.getInstance().start(); + try { + DatabaseCon.getInstance().start(); + } catch (Exception e) { + DatabaseCon.getInstance().start(ORIGINPATH); + } RMemcachedServer.initFlag = true; for (int i = 0; i < threads; i++) { @@ -163,17 +169,17 @@ public class RMemcachedServer { JSONArray results = new JSONArray(); JSONArray arrays = webSession.results; int endIndex = arrays.length(); - for (int i = startIndex; i < endIndex && i < startIndex + 1000; i++){ + for (int i = startIndex; i < endIndex && i < startIndex + RESULTTHROLD; i++){ try { JSONObject aResult = (JSONObject) arrays.get(i); - int nodeNum = Integer.parseInt((String) aResult.get("node")); - aResult.put("node", getOriginNode(nodeNum)); +// int nodeNum = Integer.parseInt((String) aResult.get("node")); +// aResult.put("node", getOriginNode(nodeNum)); results.put(aResult); } catch (Exception e) { e.printStackTrace(); } } - startIndex = endIndex < startIndex+1000 ? endIndex : startIndex+1000; + startIndex = endIndex < startIndex+RESULTTHROLD ? endIndex : startIndex+RESULTTHROLD; return results; } diff --git a/Website/src/dbcfg.properties b/Website/src/dbcfg.properties new file mode 100644 index 0000000..9630ee7 --- /dev/null +++ b/Website/src/dbcfg.properties @@ -0,0 +1,5 @@ +url = jdbc:mysql://192.168.3.218:3306/tpcw +username = root +password = 1234 +sqlget = select c_id, c_uname, c_passwd, c_birthdate from customer where c_id = ? +sqlset = replace into customer(c_id, c_birthdaye) values(?, ?) \ No newline at end of file diff --git a/Website/src/servlets/GetInfoServlet.java b/Website/src/servlets/GetInfoServlet.java index 1ca1bb8..fb5c2ba 100644 --- a/Website/src/servlets/GetInfoServlet.java +++ b/Website/src/servlets/GetInfoServlet.java @@ -14,6 +14,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; import dao.MemcachedServer; import dao.RMemcachedServer; @@ -70,13 +72,24 @@ public class GetInfoServlet extends HttpServlet { PrintWriter out = response.getWriter(); int type = request.getParameterMap().size(); switch (type) { - case 5:{ + case 3:{ System.out.println("Start Run!!!"); - final String[] args = new String[5]; + final String[] args = new String[3]; for (int i = 1; i <= args.length; i++) { args[i-1] = request.getParameter("para"+i); System.out.print("I = " + args[i-1] + "; "); } + if (args[2].equals("read")){ + args[2] = "1"; + } else if (args[2].equals("browser")){ + args[2] = "0.95"; + } else if (args[2].equals("shop")){ + args[2] = "0.8"; + } else if (args[2].equals("order")){ + args[2] = "0.5"; + } else { + args[2] = "0"; + } System.out.println(); new Thread(new Runnable() { @Override @@ -106,7 +119,8 @@ public class GetInfoServlet extends HttpServlet { } break; case 1:{ - while (!RMemcachedServer.initFlag && !RMemcachedServer.status) { + while (!RMemcachedServer.initFlag && !RMemcachedServer.status && + !MemcachedServer.initFlag && !MemcachedServer.status) { try { Thread.sleep(100); } catch (InterruptedException e) { @@ -114,22 +128,40 @@ public class GetInfoServlet extends HttpServlet { } } System.out.println("Get Result!!!"); - String result = RMemcachedServer.getResult().toString(); - out.println(result); + JSONArray resultR = RMemcachedServer.getResult(); + JSONArray resultM = MemcachedServer.getResult(); + JSONObject result = new JSONObject(); + try { + result.put("R", resultR); + result.put("M", resultM); + } catch (JSONException e) { + e.printStackTrace(); + } + + out.println(result.toString()); out.flush(); out.close(); } break; case 2:{ - float time = RMemcachedServer.time / 1000000000.0f; - JSONArray stats = RMemcachedServer.nodeStats; - Map timeandStats = new HashMap(); - timeandStats.put("time", String.format("%.3f", time)); - timeandStats.put("stats", stats.toString()); + float timeR = RMemcachedServer.time / 1000000000.0f; + JSONArray statsR = RMemcachedServer.nodeStats; + float timeM = MemcachedServer.time / 1000000000.0f; + JSONArray statsM = MemcachedServer.nodeStats; + + Map timeandStatsR = new HashMap(); + timeandStatsR.put("time", String.format("%.3f", timeR)); + timeandStatsR.put("stats", statsR.toString()); + Map timeandStatsM = new HashMap(); + timeandStatsM.put("time", String.format("%.3f", timeM)); + timeandStatsM.put("stats", statsM.toString()); + JSONArray jsons = new JSONArray(); - jsons.put(timeandStats); + jsons.put(timeandStatsR); + jsons.put(timeandStatsM); String result = jsons.toString(); //System.out.println(result); + out.println(result); out.flush(); out.close();