Update HadoopQueryEngine

thulab · Dec 21, 2017 · c7aa5d1 · c7aa5d1
1 parent bc99e28
commit c7aa5d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/cn/edu/tsinghua/tsfile/timeseries/read/FileReader.java b/src/main/java/cn/edu/tsinghua/tsfile/timeseries/read/FileReader.java
@@ -59,11 +59,12 @@ public FileReader(ITsRandomAccessFileReader raf) throws IOException {
      * @param reader
      * @param rowGroupMetaDataList
      */
-    public FileReader(ITsRandomAccessFileReader reader, List<RowGroupMetaData> rowGroupMetaDataList) {
+    public FileReader(ITsRandomAccessFileReader reader, List<RowGroupMetaData> rowGroupMetaDataList) throws IOException {
         this.randomAccessFileReader = reader;
         this.rwLock = new ReentrantReadWriteLock();
         this.rowGroupReaderLRUList = new LinkedList<>();
         initFromRowGroupMetadataList(rowGroupMetaDataList);
+        init();
     }
 
     /**

diff --git a/src/main/java/cn/edu/tsinghua/tsfile/timeseries/read/query/HadoopQueryEngine.java b/src/main/java/cn/edu/tsinghua/tsfile/timeseries/read/query/HadoopQueryEngine.java
@@ -27,27 +27,27 @@ public HadoopQueryEngine(ITsRandomAccessFileReader raf, List<RowGroupMetaData> r
         this.rowGroupMetaDataList = rowGroupMetaDataList;
     }
 
-    private void initDeviceIdList(List<String> deviceIdList) {
+    private List<String> initDeviceIdList() {
         Set<String> deviceIdSet = new HashSet<>();
         for (RowGroupMetaData rowGroupMetaData : rowGroupMetaDataList) {
             deviceIdSet.add(rowGroupMetaData.getDeltaObjectID());
         }
-        deviceIdList = new ArrayList<>(deviceIdSet);
+        return new ArrayList<>(deviceIdSet);
     }
 
-    private void initSensorIdList(List<String> sensorIdList){
+    private List<String> initSensorIdList(){
         Set<String> sensorIdSet = new HashSet<>();
         for(RowGroupMetaData rowGroupMetaData : rowGroupMetaDataList) {
             for(TimeSeriesChunkMetaData timeSeriesChunkMetaData : rowGroupMetaData.getTimeSeriesChunkMetaDataList()){
                 sensorIdSet.add(timeSeriesChunkMetaData.getProperties().getMeasurementUID());
             }
         }
-        sensorIdList = new ArrayList<>(sensorIdSet);
+        return new ArrayList<>(sensorIdSet);
     }
 
     public QueryDataSet queryWithSpecificRowGroups(List<String> deviceIdList, List<String> sensorIdList, FilterExpression timeFilter, FilterExpression freqFilter, FilterExpression valueFilter) throws IOException{
-        if(deviceIdList == null)initDeviceIdList(deviceIdList);
-        if(sensorIdList == null)initSensorIdList(sensorIdList);
+        if(deviceIdList == null)deviceIdList = initDeviceIdList();
+        if(sensorIdList == null)sensorIdList = initSensorIdList();
 
         List<Path> paths = new ArrayList<>();
         for(String deviceId : deviceIdList){
@@ -122,4 +122,4 @@ public boolean getMoreRecords() throws IOException {
             }
         };
     }
-}
+}