@@ -63,45 +63,45 @@ public static void main(String[] args)
6363 // set session fetchSize
6464 session .setFetchSize (10000 );
6565
66- // // createTemplate();
67- // createAlignedTimeseries();
68- // createAlignedTimeseriesWithNullPartical();
69- //
70- // insertAlignedRecord();
66+ // createTemplate();
67+ createAlignedTimeseries ();
68+ createAlignedTimeseriesWithNullPartical ();
69+
70+ insertAlignedRecord ();
7171 // insertAlignedRecords();
7272 // insertAlignedRecordsOfOneDevice();
7373
7474 // insertAlignedStringRecord();
7575 // insertAlignedStringRecords();
7676
77- insertTabletWithAlignedTimeseriesMethod1 ();
77+ // insertTabletWithAlignedTimeseriesMethod1();
7878 // insertTabletWithAlignedTimeseriesMethod2();
7979 // insertNullableTabletWithAlignedTimeseries();
8080 // insertTabletsWithAlignedTimeseries();
81- // session.executeNonQueryStatement(FLUSH);
82- // selectTest();
83- // selectWithValueFilterTest();
84- // selectWithLastTest();
85- // selectWithLastTestWithoutValueFilter();
86- // session.executeNonQueryStatement("delete from root.sg_1.d1.s1 where time <= 5");
87- // System.out.println("execute sql delete from root.sg_1.d1.s1 where time <= 5");
88- // selectTest();
89- // selectWithValueFilterTest();
90- // selectWithLastTest();
91- // selectWithLastTestWithoutValueFilter();
92- // session.executeNonQueryStatement("delete from root.sg_1.d1.s2 where time <= 3");
93- // System.out.println("execute sql delete from root.sg_1.d1.s2 where time <= 3");
94- //
95- // selectTest();
96- // selectWithValueFilterTest();
97- // selectWithLastTest();
98- // selectWithLastTestWithoutValueFilter();
99- // session.executeNonQueryStatement("delete from root.sg_1.d1.s1 where time <= 10");
100- // System.out.println("execute sql delete from root.sg_1.d1.s1 where time <= 10");
101- // selectTest();
102- // selectWithValueFilterTest();
103- // selectWithLastTest();
104- // selectWithLastTestWithoutValueFilter();
81+ session .executeNonQueryStatement (FLUSH );
82+ selectTest ();
83+ selectWithValueFilterTest ();
84+ selectWithLastTest ();
85+ selectWithLastTestWithoutValueFilter ();
86+ session .executeNonQueryStatement ("delete from root.sg_1.d1.s1 where time <= 5" );
87+ System .out .println ("execute sql delete from root.sg_1.d1.s1 where time <= 5" );
88+ selectTest ();
89+ selectWithValueFilterTest ();
90+ selectWithLastTest ();
91+ selectWithLastTestWithoutValueFilter ();
92+ session .executeNonQueryStatement ("delete from root.sg_1.d1.s2 where time <= 3" );
93+ System .out .println ("execute sql delete from root.sg_1.d1.s2 where time <= 3" );
94+
95+ selectTest ();
96+ selectWithValueFilterTest ();
97+ selectWithLastTest ();
98+ selectWithLastTestWithoutValueFilter ();
99+ session .executeNonQueryStatement ("delete from root.sg_1.d1.s1 where time <= 10" );
100+ System .out .println ("execute sql delete from root.sg_1.d1.s1 where time <= 10" );
101+ selectTest ();
102+ selectWithValueFilterTest ();
103+ selectWithLastTest ();
104+ selectWithLastTestWithoutValueFilter ();
105105
106106 // selectWithValueFilterTest();
107107 // selectWithGroupByTest();
@@ -347,6 +347,7 @@ private static void insertTabletWithAlignedTimeseriesMethod1()
347347 // only measurementId and data type in MeasurementSchema take effects in Tablet
348348 List <IMeasurementSchema > schemaList = new ArrayList <>();
349349 schemaList .add (new MeasurementSchema ("s1" , TSDataType .INT64 ));
350+ schemaList .add (new MeasurementSchema ("s2" , TSDataType .INT32 ));
350351
351352 Tablet tablet = new Tablet (ROOT_SG1_D1 , schemaList );
352353 long timestamp = 1 ;
@@ -356,30 +357,8 @@ private static void insertTabletWithAlignedTimeseriesMethod1()
356357 tablet .addTimestamp (rowIndex , timestamp );
357358 tablet .addValue (
358359 schemaList .get (0 ).getMeasurementName (), rowIndex , new SecureRandom ().nextLong ());
359-
360- if (tablet .getRowSize () == tablet .getMaxRowNumber ()) {
361- session .insertAlignedTablet (tablet , true );
362- tablet .reset ();
363- }
364- timestamp ++;
365- }
366-
367- if (tablet .getRowSize () != 0 ) {
368- session .insertAlignedTablet (tablet );
369- tablet .reset ();
370- }
371-
372- schemaList = new ArrayList <>();
373- schemaList .add (new MeasurementSchema ("s2" , TSDataType .INT32 ));
374-
375- tablet = new Tablet (ROOT_SG1_D1 , schemaList );
376- timestamp = 1 ;
377-
378- for (long row = 1 ; row < 100 ; row ++) {
379- int rowIndex = tablet .getRowSize ();
380- tablet .addTimestamp (rowIndex , timestamp );
381360 tablet .addValue (
382- schemaList .get (0 ).getMeasurementName (), rowIndex , new SecureRandom ().nextInt ());
361+ schemaList .get (1 ).getMeasurementName (), rowIndex , new SecureRandom ().nextInt ());
383362
384363 if (tablet .getRowSize () == tablet .getMaxRowNumber ()) {
385364 session .insertAlignedTablet (tablet , true );
@@ -393,7 +372,7 @@ private static void insertTabletWithAlignedTimeseriesMethod1()
393372 tablet .reset ();
394373 }
395374
396- // session.executeNonQueryStatement(FLUSH);
375+ session .executeNonQueryStatement (FLUSH );
397376 }
398377
399378 /** Method 2 for insert tablet with aligned timeseries */
0 commit comments