Merge pull request #20 from Beyyes/f_cgf_make_read_code_tidy

some private methods need to be changed to public

Author: Beyyes

src/main/java/cn/edu/thu/tsfile/timeseries/read/FileReader.java

@@ -19,6 +19,7 @@
  * @description This class is used to read {@code TSFileMetaData} and construct
  *              file level reader which contains the information of
  *              rowgroupreader.
+ *
  * @author Jinrui Zhang
  *
  */

src/main/java/cn/edu/thu/tsfile/timeseries/read/RecordReader.java

@@ -6,6 +6,7 @@
 import java.util.List;
 import java.util.Map;
 
+import cn.edu.thu.tsfile.common.exception.UnSupportedDataTypeException;
 import cn.edu.thu.tsfile.common.utils.TSRandomAccessFileReader;
 import cn.edu.thu.tsfile.file.metadata.enums.TSDataType;
 import cn.edu.thu.tsfile.timeseries.filter.definition.FilterFactory;
@@ -20,6 +21,7 @@
 /**
  * @description This class implements several read methods which can read data in different ways.<br>
  * This class provides some APIs for reading.
+ *
  * @author Jinrui Zhang
  *
  */
@@ -67,8 +69,7 @@ public DynamicOneColumnData getValueInOneColumn(DynamicOneColumnData res, int fe
 	}
 
 	/**
-	 * Read function 1#2: read one column without filter from one specific
-	 * RowGroupReader
+	 * Read function 1#2: read one column without filter from one specific RowGroupReader
 	 * 
 	 * @param rowGroupReader
 	 * @param measurementId
@@ -149,7 +150,7 @@ public DynamicOneColumnData getValueInOneColumn(DynamicOneColumnData res, int fe
 	}
 
 	/**
-	 * Read funtion 2#1: read one column with filter
+	 * Read function 2#1: read one column with filter
 	 * 
 	 * @throws IOException
 	 */
@@ -191,7 +192,7 @@ public DynamicOneColumnData getValuesUseFilter(DynamicOneColumnData res, int fet
 	}
 
 	/**
-	 * Read funtion 2#2: read one column with filter from specific
+	 * Read function 2#2: read one column with filter from specific
 	 * RowGroupReader
 	 * 
 	 * @param rowGroupReader,
@@ -213,7 +214,7 @@ private DynamicOneColumnData getValuesUseFilter(DynamicOneColumnData res, int fe
 	}
 
 	/**
-	 * Read funtion 2#3: read one column with filter from specific
+	 * Read function 2#3: read one column with filter from specific
 	 * RowGroupReader according to the index
 	 * 
 	 * @param deltaObjectUID
@@ -243,7 +244,7 @@ public DynamicOneColumnData getValuesUseFilter(DynamicOneColumnData res, int fet
 	}
 
 	/**
-	 * Read funtion 2#4: read one column with filter from specific
+	 * Read function 2#4: read one column with filter from specific
 	 * RowGroupReader(s) according to the indexList
 	 * 
 	 * @param deltaObjectUID
@@ -497,10 +498,11 @@ public FilterSeries<?> getColumnByMeasurementName(String deltaObject, String mea
 			return FilterFactory.doubleFilterSeries(deltaObject, measurement, FilterSeriesType.VALUE_FILTER);
 		} else if (type == TSDataType.BOOLEAN) {
 			return FilterFactory.booleanFilterSeries(deltaObject, measurement, FilterSeriesType.VALUE_FILTER);
-		} else if (type == TSDataType.ENUMS) {
+		} else if (type == TSDataType.ENUMS || type == TSDataType.BYTE_ARRAY) {
 			return FilterFactory.stringFilterSeries(deltaObject, measurement, FilterSeriesType.VALUE_FILTER);
+		} else {
+			throw new UnSupportedDataTypeException(String.valueOf(type));
 		}
-		return null;
 	}
 
 	private void checkSeries(String deltaObject, String measurement) throws IOException {

src/main/java/cn/edu/thu/tsfile/timeseries/read/query/CrossQueryTimeGenerator.java

@@ -54,16 +54,13 @@ private int initRetMapAndFilterMap(FilterExpression valueFilter) {
         if (valueFilter instanceof SingleSeriesFilterExpression) {
             idxCount.set(tmpIdx, 1);
             return 1;
-
         } else if (valueFilter instanceof CSAnd) {
             FilterExpression left = ((CSAnd) valueFilter).getLeft();
             FilterExpression right = ((CSAnd) valueFilter).getRight();
             int l = initRetMapAndFilterMap(left);
             int r = initRetMapAndFilterMap(right);
             idxCount.set(tmpIdx, l + r + 1);
             return l + r + 1;
-
-            // else if(valueFilter instanceof CSOr)
         } else {
             FilterExpression left = ((CSOr) valueFilter).getLeft();
             FilterExpression right = ((CSOr) valueFilter).getRight();
@@ -91,11 +88,14 @@ public DynamicOneColumnData getMoreRecordForOneCol(int idx, SingleSeriesFilterEx
     public abstract DynamicOneColumnData getDataInNextBatch(DynamicOneColumnData res, int fetchSize
             , SingleSeriesFilterExpression valueFilter) throws ProcessorException, IOException;
 
+    /**
+     * Calculate common time using FilterExpression.
+     */
     public long[] generateTimes() throws ProcessorException, IOException {
         long[] res = new long[fetchSize];
 
         int cnt = 0;
-        SingleValueVisitor<Long> timeFilterVisitor = new SingleValueVisitor<Long>();
+        SingleValueVisitor<Long> timeFilterVisitor = new SingleValueVisitor<>();
         while (cnt < fetchSize) {
             //must before calculateOneTime
             dfsCnt = -1;
@@ -184,5 +184,4 @@ private long calculateOneTime(FilterExpression valueFilter) throws ProcessorExce
         }
         return -1;
     }
-}
-
+}

src/main/java/cn/edu/thu/tsfile/timeseries/read/query/DynamicOneColumnData.java

@@ -499,7 +499,7 @@ public String getStringTimeValuePair(int idx) {
         return sb.toString();
     }
 
-    private void putAValueFromDynamicOneColumnData(DynamicOneColumnData B, int idx) {
+    public void putAValueFromDynamicOneColumnData(DynamicOneColumnData B, int idx) {
         switch (dataType) {
             case BOOLEAN:
                 putBoolean(B.getBoolean(idx));

src/main/java/cn/edu/thu/tsfile/timeseries/read/query/QueryEngine.java

@@ -313,8 +313,7 @@ public boolean getMoreRecords() throws IOException {
     }
 
     /**
-     * CrossQuery #3: Function for Cross Columns Query from specific
-     * RowGroup(s)
+     * CrossQuery #3: Function for Cross Columns Query from specific RowGroup(s)
      *
      * @param paths
      * @param timeFilter