From 76edf6ae2f160527427833ae0aa94a16ab279fa0 Mon Sep 17 00:00:00 2001 From: zentol Date: Mon, 8 May 2017 11:56:57 +0200 Subject: [PATCH] [FLINK-5892] Enable 1.2 keyed state test --- .../operator/restore/keyed/KeyedJob.java | 14 ++++++-------- .../operatorstate/complexKeyed/_metadata | Bin 137490 -> 134953 bytes 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java index 6add7b2a76f8f..3c28c3b94da8a 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java +++ b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java @@ -97,10 +97,9 @@ public static SingleOutputStreamOperator createFirstStatefulMap(Executi .map(new StatefulStringStoringMap(mode, "first")) .setParallelism(4); - // TODO: re-enable this when generating the actual 1.2 savepoint - //if (mode == ExecutionMode.MIGRATE || mode == ExecutionMode.RESTORE) { - map.uid("first"); - //} + if (mode == ExecutionMode.MIGRATE || mode == ExecutionMode.RESTORE) { + map.uid("first"); + } return map; } @@ -110,10 +109,9 @@ public static SingleOutputStreamOperator createSecondStatefulMap(Execut .map(new StatefulStringStoringMap(mode, "second")) .setParallelism(4); - // TODO: re-enable this when generating the actual 1.2 savepoint - //if (mode == ExecutionMode.MIGRATE || mode == ExecutionMode.RESTORE) { - map.uid("second"); - //} + if (mode == ExecutionMode.MIGRATE || mode == ExecutionMode.RESTORE) { + map.uid("second"); + } return map; } diff --git a/flink-tests/src/test/resources/operatorstate/complexKeyed/_metadata b/flink-tests/src/test/resources/operatorstate/complexKeyed/_metadata index 9e03876cfce81f15b09d91532b38322e647c55a2..0a1ed10e4823dada53249966850b13e9180ab2f5 100644 GIT binary patch delta 5680 zcmds5TZ|Sp6rO*7U|0TG6a@tr@poB4(c;`^il8V80*Z>FfQUOY?VzHl>lJUmFBmn( zkllw3FJ59oLImYvH1Y&7QD00X~@Df@MIEre&i(syX!k@o++REaZ(gs#)L02 zDDS6GJ_uM=WrAliEP0X-_D*SgYn%t2IQ4<8W4c;bs7J?XEJIv{C=vS*TZk_szK8fB z;%A88BL0NSw8&tu~30 z$&{Q;$vKW1zpXTdnx;~6E+t)*OrzvHN~TkC{t(gM6IfH_K+@v}toLi`wD%YskG?Pg zm-0khij(g%_9=%9PTOLz*==yfy9Q@1GC2EdgLCdR=>KIfe#KymH_gMmJq8zCV{qY@ z1{dFLaOs~0m!l7@&;xXwmAg#->Z=W|{lZ{xWw89i;QE&gZqQTaI2+#vpUL>lq>95N zU}+SlEDB@6GLaN46<(V7k<1I3I8NV!_YX8{{q>Xg4lB*69afb6tm3i=b0&%^WKkk> zmZxz9QxWC9h^wedBQ46l5oPJgQt(PJUL+-ma?V+y&rny1 za@=THIk-SIXNmSMOJ-1u_E&4UkXmL^GK&&Da$DzOYMDJkkT0R8ODSQL%%S8mN<2#R zTClwa)Dr4}s=>l{Qg^iz7#zK0M5>H!B&G!Xbl8$ol2O7bnM;Y@y=x$ddNZ0wP4g+y z(S?15D~BvfS(|vNOiV{AtgU0EtVb!V8=YgKtWg#T8G*1S6~rM?1(K2p3F^wzAWS?F z$Pm87sUfUwhZWX1EaQ|zxC(;k!S(`<&m#zai$s=5A=0c8LJMnPgf*64>_vK|6ug`)tMAsio) z?x=*5L@8sIdmd+5mIXl;3g1sbaXMA#Xu{pr0@b~B+^ZER-gtni1hAc{9^*Pg;^t4!_<9bW(AF2co8!35!k_RbyNWYp9BQ-)5@j-hU+tst` zzx`i-2Kpd(Xi^@g)TM7~1{7%<9CR`*PX&ihsVX*Fh^dAPR&&NTY^>M-(`G+CpUJ$^k dx=I28N9$Pql=CDjxQvq^_N33j0Zx8-{s(<#?P~x4 literal 137490 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