From bc5af46f10df8deb68e329a6431ee27e69fdf7c3 Mon Sep 17 00:00:00 2001 From: Dilip Biswal Date: Wed, 4 May 2016 22:51:19 -0700 Subject: [PATCH 1/2] [SPARK-14893] Re-enable HiveSparkSubmitSuite SPARK-8489 test after HiveContext is removed --- .../regression-test-SPARK-8489/test-2.10.jar | Bin 6873 -> 6907 bytes .../regression-test-SPARK-8489/test-2.11.jar | Bin 7039 -> 7072 bytes .../spark/sql/hive/HiveSparkSubmitSuite.scala | 3 +-- 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.10.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.10.jar index 26d410f33029bb2a9d2b65d9f6985aa159e924a8..2c4c4f07dacd9629b519f7cca7569161cc5a9c3c 100644 GIT binary patch delta 2896 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 BHB|rr diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.11.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.11.jar index f34784752f69f71ce56736d3493cfd55bdc32b4a..9c48482824d8c4925669f939166f0fad3623d4d8 100644 GIT binary patch delta 3395 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 CehnP} delta 3348 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 Z+<&S6CjvU)sT=x}ReJ(Dub`*5e*w}!05bpp diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala index 77a6a94a6719..47f425d0605b 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/HiveSparkSubmitSuite.scala @@ -142,8 +142,7 @@ class HiveSparkSubmitSuite runSparkSubmit(args) } - // TODO: re-enable this after rebuilding the jar (HiveContext was removed) - ignore("SPARK-8489: MissingRequirementError during reflection") { + test("SPARK-8489: MissingRequirementError during reflection") { // This test uses a pre-built jar to test SPARK-8489. In a nutshell, this test creates // a HiveContext and uses it to create a data frame from an RDD using reflection. // Before the fix in SPARK-8470, this results in a MissingRequirementError because From f9f80e73cb79eb55bee3aaba0939c7730531b396 Mon Sep 17 00:00:00 2001 From: Dilip Biswal Date: Thu, 5 May 2016 13:49:39 -0700 Subject: [PATCH 2/2] review comments from andrew --- .../regression-test-SPARK-8489/Main.scala | 12 +++++++----- .../regression-test-SPARK-8489/test-2.10.jar | Bin 6907 -> 6865 bytes .../regression-test-SPARK-8489/test-2.11.jar | Bin 7072 -> 7030 bytes 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala b/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala index 10a017df831e..4fbbbacb7608 100644 --- a/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala +++ b/sql/hive/src/test/resources/regression-test-SPARK-8489/Main.scala @@ -15,7 +15,6 @@ * limitations under the License. */ -import org.apache.spark.SparkContext import org.apache.spark.sql.SparkSession /** @@ -33,15 +32,18 @@ object Main { def main(args: Array[String]) { // scalastyle:off println println("Running regression test for SPARK-8489.") - val sc = new SparkContext("local", "testing") - val sparkSession = SparkSession.withHiveSupport(sc) + val spark = SparkSession.builder + .master("local") + .appName("testing") + .enableHiveSupport() + .getOrCreate() // This line should not throw scala.reflect.internal.MissingRequirementError. // See SPARK-8470 for more detail. - val df = sparkSession.createDataFrame(Seq(MyCoolClass("1", "2", "3"))) + val df = spark.createDataFrame(Seq(MyCoolClass("1", "2", "3"))) df.collect() println("Regression test for SPARK-8489 success!") // scalastyle:on println - sc.stop() + spark.stop() } } diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.10.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.10.jar index 2c4c4f07dacd9629b519f7cca7569161cc5a9c3c..3f28d37b93150ebdeec4c6d803351f8c9e1f6cf2 100644 GIT binary patch delta 1746 zcmY+FdpOez7{`C6Wj4cHViS5;RC8%AM`+Qh-0#O-bz*KuI5@~0jN`81tkppzaTr4q zDJ(H_WEvZ#A+ffVOQBRQi4*^v&il{jdEV#qyzl$h`~70fHHN#`i|j=(Hq&A)M_Nu0} z@DNvLpLf{8ULAOVBm?BPcjd1$Q=Zl}s&gGR5%&^DKKWWlP>l)m-7^D2=gcp? zTZC5R+WZzP2%06P5R9-UrxRuT!JhL*bh`?6{0LSvdk7NS7Q1$Xy@?hB}j6CWk~Bos3`qR^hD^%dM6c?Vj9WO3dB3aIe!lfFD)iF z@Do|jgO22jASjCp~eXtoXky?2?5-kN(GS7FWCg?*RE|g@LpcNl@6o=ka(xVQ+*vP3)NhLB%eU@tZ(?J!Knp~*f;;|U_cg!-nsKf_}mu^!2Wgrj@ z_LYah)_qJ>nX)_y5Mj_=*&7kT{cL*OYKTa>aR5iPH+Y(){3bT6oT@cA;H))Q^I9i= zOXG}sPnFsHvaYvUU=#JkUmbRz1R%*YaQ?6J$7)z?&*O^;mTNzM3*@}=;=vxK) zC*#fgBp-z#PN!~zETY;-RU4y`Rl(3((_bZ3Q2P|Y%orm#L_&z%AY%~bjmv!vnqZJY zW{gQ_j^dq%sb9XdIaX#9HR6c=OYIYro03a1>X3eF6xuW&4@N_e8Rz%dmg&wg$~#{1 zT)X=~Lfx}?tE;zl38WGFX}Irl!y-)uijQd$la8~%K0-|`2aOuk1z#dIk&44xuf z>e8^J^ZTh?FPVNB(|=&;Y#;c>dN4t0iJa^IVfn-fOI+lI!zYMLYoS1UJ{Idxk^dw- za2E05u4Mh1l+WNB7sKbioRj&D$KxlXC?m%6bAGR)B&_=a?%<*7mp0R!LvCf}sT>St zxu!oF`SHHR7q?GqnRto*i*NtA8NCWC@Jz2*Sy;Q$L0BaAy;n)fUTWW}&wFp-VlM$f zurvmPzyQF90l@$NbjtuF0u+3sb)o>tN)o*0du)smiYA_ncr_%o$KHz1IH%-gJHpF# zMbh~=_U#y+XmtP0IO%AdV?r97{>tL#JW&%_L>}+fnx1Ao-xAwd_Jex=p35Kri2Anh zf0@uy1~Y^1#6ZiqB3^tq4=j+!cA1E@*d-llEd5Qe`R`!LHWH)0)B1ia3i!URP;60$ zcb#Th_2n%|03gW$0OETE2%?Zt2X-C%G2{)jH~?r%0KhlxyQ-vcPzU$!Meelz1#^%o A00000 delta 1774 zcmY+FdpHvc8^C8nbD3!7x=kIoDE@*n&n}d*`?E)3cD7 z*)N|ysNNK-sn)EZM`H=M6bY0WHB^~_c2OpB8D|P@qB~3Y%N)0o(GCIANYjH)+@5cw zUR7OFel3-VNYBYfPg?_X83QaJ3Nb?jU_W7xxf{BpT!NBd49iw^ee$np{)_lZO2%be z!qj~bw>ds>G`Ym5SP8c)~j zVEg3XmK}05AC?m5NO}uOoY`3_i1k+{E$rL>xvZ00jVU&Ty-Su)$%r|pv$!Bsz{StI zsl0XIBe0~bVJe!{8sS}P=wVYLzPq+lnlVk{FC{lV=6Ft|T+8DQGc(^R&4>q)Q`+vY zt$zvisipldXYQoN3QW=1CYJo$O8*U$MjN>Dt6kiAX7yG}mK$7&kWkf?cRW^3(nNr- zI-{`C9!Yd5)%LJ$v7eK_>|c)4Ew8RAVt|U#x2)*GI@EjOEE$J-*K6vdsT+a3w-oSN zEw`iGh3^aR#@1qcHw;4T`VBV7pYIwUm@KR*qPaeO*OFoHOuw!m;SOQz%((Lp z*FE}6xn-fd4?^S}{Ysl&Ie&&lLV70{&$qslzGOFXZ=P$CG8HN4a2P3KVB}xIq62s| znU_;gI}I;mIzx%z-!N%)pV5tHvUw$5)cMX*ooasHT;E;i^o$5&cqSzlX86{e)b(7j z+7l6!S0IDhFnX#xRW=ud$eZkp5CS=&RL?gTDyu+ubZ+(XE0XmDkBzEsYis zQ=RnP=X4~08MB!Vx~5JfouN>_OA`s|ey7z@s0%s3xZKjkHAreV z5ceU$EL$xqq5jD=xhTuxF?jg&_w6? z8&&bQE{AA4$?^O2e#al>IcB)#%s7W{L$H4TJ!ZS>3jM2L>8Fc@60o6XM{j!2!#PEY z-+!8Sx*+s!(mb)aAv<@yw=<9&7cLnD3Ov8*mzb^f*B_Njf$nDyfKxZ=pR%O@fGK$Z z;9nQLtppqiq#+1B2+N$UfwBJjKO5If+Vd-$30ssUTQT^lNfWc86sV&nFbD0yU{W(|VLg0<}l9+mc*+p5-?0g7#dNNu5tKfB-=BSKq%}j(~4M>1*zK z)h;S3!Y-mML+*&|-Y02mh7m#gF9oK4a-Z(%xP3C!Q3_uh9RFE_HK}f>wO9Jqr}2#e q0N}8+Gz|8~&uVA_v*lPxa!}Sa4f*}j9Su#1QC5|PuC$r@-qhbdOfiW7 diff --git a/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.11.jar b/sql/hive/src/test/resources/regression-test-SPARK-8489/test-2.11.jar index 9c48482824d8c4925669f939166f0fad3623d4d8..5e093697e219a249e6f6dedb1ab9f567c58a2fa9 100644 GIT binary patch delta 2106 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 OCSxH&$0x;)M*ar|d+W*o