@@ -340,11 +340,26 @@ public void testTableParserSkipsUnnecessaryBitMaps() throws Exception {
340340 false )) {
341341 final Iterator <TabletInsertionEvent > iterator = parser .toTabletInsertionEvents ().iterator ();
342342 Assert .assertTrue (iterator .hasNext ());
343- final Tablet parsedTablet =
344- ((PipeRawTabletInsertionEvent ) iterator .next ()).convertToTablet ();
345- assertBitMapExistence (parsedTablet , false , false , true );
346- Assert .assertTrue (parsedTablet .isNull (1 , 2 ));
347- Assert .assertFalse (iterator .hasNext ());
343+ Tablet parsedTablet = ((PipeRawTabletInsertionEvent ) iterator .next ()).convertToTablet ();
344+ if (parsedTablet .getSchemas ().size () == 3 ) {
345+ assertBitMapExistence (parsedTablet , false , false , true );
346+ Assert .assertTrue (parsedTablet .isNull (1 , 2 ));
347+ Assert .assertFalse (iterator .hasNext ());
348+ } else {
349+ if (parsedTablet .getSchemas ().get (1 ).getMeasurementName ().equals ("dense" )) {
350+ Assert .assertNull (parsedTablet .getBitMaps ());
351+ } else {
352+ Assert .assertTrue (parsedTablet .isNull (1 , 1 ));
353+ }
354+ while (iterator .hasNext ()) {
355+ parsedTablet = ((PipeRawTabletInsertionEvent ) iterator .next ()).convertToTablet ();
356+ if (parsedTablet .getSchemas ().get (1 ).getMeasurementName ().equals ("dense" )) {
357+ Assert .assertNull (parsedTablet .getBitMaps ());
358+ } else {
359+ Assert .assertTrue (parsedTablet .isNull (1 , 1 ));
360+ }
361+ }
362+ }
348363 }
349364 } finally {
350365 CommonDescriptor .getInstance ()
@@ -1095,11 +1110,19 @@ private void testTreeParserSkipsUnnecessaryBitMaps(final boolean isQuery) throws
10951110 false )) {
10961111 final Iterator <TabletInsertionEvent > iterator = parser .toTabletInsertionEvents ().iterator ();
10971112 Assert .assertTrue (iterator .hasNext ());
1098- final Tablet parsedTablet =
1099- ((PipeRawTabletInsertionEvent ) iterator .next ()).convertToTablet ();
1100- assertBitMapExistence (parsedTablet , false , true );
1101- Assert .assertTrue (parsedTablet .isNull (1 , 1 ));
1102- Assert .assertFalse (iterator .hasNext ());
1113+ Tablet parsedTablet = ((PipeRawTabletInsertionEvent ) iterator .next ()).convertToTablet ();
1114+ if (parsedTablet .getSchemas ().size () > 1 ) {
1115+ assertBitMapExistence (parsedTablet , false , true );
1116+ Assert .assertTrue (parsedTablet .isNull (1 , 1 ));
1117+ Assert .assertFalse (iterator .hasNext ());
1118+ } else {
1119+ Assert .assertNull (parsedTablet .getBitMaps ());
1120+ Assert .assertTrue (iterator .hasNext ());
1121+ while (iterator .hasNext ()) {
1122+ parsedTablet = ((PipeRawTabletInsertionEvent ) iterator .next ()).convertToTablet ();
1123+ Assert .assertNull (parsedTablet .getBitMaps ());
1124+ }
1125+ }
11031126 }
11041127 } finally {
11051128 CommonDescriptor .getInstance ()
0 commit comments