Skip to content

Commit d5cc577

Browse files
CaideyipiCaideyipi
committed
local_query
1 parent 32813d4 commit d5cc577

12 files changed

Lines changed: 49 additions & 49 deletions

File tree

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
public class BloomFilterCache {
4747

4848
private static final Logger LOGGER = LoggerFactory.getLogger(BloomFilterCache.class);
49-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
49+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
5050
private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
5151
private static final long MEMORY_THRESHOLD_IN_BLOOM_FILTER_CACHE =
5252
CONFIG.getAllocateMemoryForBloomFilterCache();
@@ -96,7 +96,7 @@ public BloomFilter get(
9696
BloomFilter bloomFilter = lruCache.get(key, loader);
9797

9898
if (debug) {
99-
DEBUG_LOGGER.info("get bloomFilter from cache where filePath is: {}", key.filePath);
99+
QUERY_LOGGER.info("get bloomFilter from cache where filePath is: {}", key.filePath);
100100
}
101101

102102
return bloomFilter;

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
public class ChunkCache {
5959

6060
private static final Logger LOGGER = LoggerFactory.getLogger(ChunkCache.class);
61-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
61+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
6262
private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
6363
private static final long MEMORY_THRESHOLD_IN_CHUNK_CACHE =
6464
CONFIG.getAllocateMemoryForChunkCache();
@@ -153,7 +153,7 @@ private Chunk get(
153153
Chunk chunk = lruCache.get(chunkCacheKey, chunkLoader);
154154

155155
if (debug) {
156-
DEBUG_LOGGER.info("get chunk from cache whose key is: {}", chunkCacheKey);
156+
QUERY_LOGGER.info("get chunk from cache whose key is: {}", chunkCacheKey);
157157
}
158158

159159
return constructChunk(chunk, timeRangeList, chunkStatistic);

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
public class TimeSeriesMetadataCache {
6767

6868
private static final Logger logger = LoggerFactory.getLogger(TimeSeriesMetadataCache.class);
69-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
69+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
7070
private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
7171
private static final long MEMORY_THRESHOLD_IN_TIME_SERIES_METADATA_CACHE =
7272
config.getAllocateMemoryForTimeSeriesMetaDataCache();
@@ -152,8 +152,8 @@ public TimeseriesMetadata get(
152152

153153
if (timeseriesMetadata == null) {
154154
if (debug) {
155-
DEBUG_LOGGER.info("Cache miss: {}.{} in file: {}", key.device, key.measurement, filePath);
156-
DEBUG_LOGGER.info("Device: {}, all sensors: {}", key.device, allSensors);
155+
QUERY_LOGGER.info("Cache miss: {}.{} in file: {}", key.device, key.measurement, filePath);
156+
QUERY_LOGGER.info("Device: {}, all sensors: {}", key.device, allSensors);
157157
}
158158
// allow for the parallelism of different devices
159159
synchronized (
@@ -183,7 +183,7 @@ public TimeseriesMetadata get(
183183
+ TsFileConstant.PATH_SEPARATOR
184184
+ key.measurement)) {
185185
if (debug) {
186-
DEBUG_LOGGER.info("TimeSeries meta data {} is filter by bloomFilter!", key);
186+
QUERY_LOGGER.info("TimeSeries meta data {} is filter by bloomFilter!", key);
187187
}
188188
loadBloomFilterTime = System.nanoTime() - loadBloomFilterStartTime;
189189
return null;
@@ -217,12 +217,12 @@ public TimeseriesMetadata get(
217217
}
218218
if (timeseriesMetadata == null) {
219219
if (debug) {
220-
DEBUG_LOGGER.info("The file doesn't have this time series {}.", key);
220+
QUERY_LOGGER.info("The file doesn't have this time series {}.", key);
221221
}
222222
return null;
223223
} else {
224224
if (debug) {
225-
DEBUG_LOGGER.info(
225+
QUERY_LOGGER.info(
226226
"Get timeseries: {}.{} metadata in file: {} from cache: {}.",
227227
key.device,
228228
key.measurement,

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
public class DataRegion implements IDataRegionForQuery {
201201

202202
private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
203-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
203+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
204204

205205
/**
206206
* All newly generated chunks after merge have version number 0, so we set merged Modification
@@ -2155,7 +2155,7 @@ private List<TsFileResource> getFileResourceListForQuery(
21552155
throws MetadataException {
21562156

21572157
if (context.isDebug()) {
2158-
DEBUG_LOGGER.info(
2158+
QUERY_LOGGER.info(
21592159
"Path: {}, get tsfile list: {} isSeq: {} time filter: {}",
21602160
pathList,
21612161
tsFileResources,

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/control/FileReaderManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class FileReaderManager {
4343

4444
private static final Logger logger = LoggerFactory.getLogger(FileReaderManager.class);
4545
private static final Logger resourceLogger = LoggerFactory.getLogger("FileMonitor");
46-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
46+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
4747

4848
/** max number of file streams being cached, must be lower than 65535. */
4949
private static final int MAX_CACHED_FILE_SIZE = 30000;

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/control/QueryFileManager.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
/** QueryFileManager records the paths of files that every read uses for QueryResourceManager. */
3535
public class QueryFileManager {
3636

37-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
37+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
3838

3939
/**
4040
* QueryId -> TsFileResource -> TsFileResource. Inner Map's key and value are actually the same
@@ -134,24 +134,24 @@ void addFilePathToMap(long queryId, TsFileResource tsFile, boolean isClosed) {
134134
}
135135

136136
public void writeQueryFileInfo() {
137-
DEBUG_LOGGER.info("[Query Sealed File Info]\n");
137+
QUERY_LOGGER.info("[Query Sealed File Info]\n");
138138
for (Map.Entry<Long, Map<TsFileResource, TsFileResource>> entry :
139139
sealedFilePathsMap.entrySet()) {
140140
long queryId = entry.getKey();
141141
Set<TsFileResource> tsFileResources = entry.getValue().keySet();
142-
DEBUG_LOGGER.info("\t[queryId: {}]\n", queryId);
142+
QUERY_LOGGER.info("\t[queryId: {}]\n", queryId);
143143
for (TsFileResource tsFileResource : tsFileResources) {
144-
DEBUG_LOGGER.info("\t\t{}\n", tsFileResource.getTsFile().getAbsolutePath());
144+
QUERY_LOGGER.info("\t\t{}\n", tsFileResource.getTsFile().getAbsolutePath());
145145
}
146146
}
147-
DEBUG_LOGGER.info("[Query Unsealed File Info]\n");
147+
QUERY_LOGGER.info("[Query Unsealed File Info]\n");
148148
for (Map.Entry<Long, Map<TsFileResource, TsFileResource>> entry :
149149
unsealedFilePathsMap.entrySet()) {
150150
long queryId = entry.getKey();
151151
Set<TsFileResource> tsFileResources = entry.getValue().keySet();
152-
DEBUG_LOGGER.info("\t[queryId: {}]\n", queryId);
152+
QUERY_LOGGER.info("\t[queryId: {}]\n", queryId);
153153
for (TsFileResource tsFileResource : tsFileResources) {
154-
DEBUG_LOGGER.info("\t\t{}\n", tsFileResource.getTsFile().getAbsolutePath());
154+
QUERY_LOGGER.info("\t\t{}\n", tsFileResource.getTsFile().getAbsolutePath());
155155
}
156156
}
157157
}

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/metadata/DiskAlignedChunkMetadataLoader.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class DiskAlignedChunkMetadataLoader implements IChunkMetadataLoader {
5353
// all sub sensors' modifications
5454
private final List<List<Modification>> pathModifications;
5555

56-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
56+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
5757
private static final SeriesScanCostMetricSet SERIES_SCAN_COST_METRIC_SET =
5858
SeriesScanCostMetricSet.getInstance();
5959

@@ -86,8 +86,8 @@ public List<IChunkMetadata> loadChunkMetadataList(ITimeSeriesMetadata timeSeries
8686
|| alignedChunkMetaData.getStartTime() > alignedChunkMetaData.getEndTime());
8787

8888
if (context.isDebug()) {
89-
DEBUG_LOGGER.info("After removed by filter Chunk meta data list is: ");
90-
alignedChunkMetadataList.forEach(c -> DEBUG_LOGGER.info(c.toString()));
89+
QUERY_LOGGER.info("After removed by filter Chunk meta data list is: ");
90+
alignedChunkMetadataList.forEach(c -> QUERY_LOGGER.info(c.toString()));
9191
}
9292

9393
SERIES_SCAN_COST_METRIC_SET.recordSeriesScanCost(
@@ -97,19 +97,19 @@ public List<IChunkMetadata> loadChunkMetadataList(ITimeSeriesMetadata timeSeries
9797
final long t3 = System.nanoTime();
9898

9999
if (context.isDebug()) {
100-
DEBUG_LOGGER.info(
100+
QUERY_LOGGER.info(
101101
"Modifications size is {} for file Path: {} ",
102102
pathModifications.size(),
103103
resource.getTsFilePath());
104-
pathModifications.forEach(c -> DEBUG_LOGGER.info(c.toString()));
104+
pathModifications.forEach(c -> QUERY_LOGGER.info(c.toString()));
105105
}
106106

107107
// remove ChunkMetadata that have been deleted
108108
ModificationUtils.modifyAlignedChunkMetaData(alignedChunkMetadataList, pathModifications);
109109

110110
if (context.isDebug()) {
111-
DEBUG_LOGGER.info("After modification Chunk meta data list is: ");
112-
alignedChunkMetadataList.forEach(c -> DEBUG_LOGGER.info(c.toString()));
111+
QUERY_LOGGER.info("After modification Chunk meta data list is: ");
112+
alignedChunkMetadataList.forEach(c -> QUERY_LOGGER.info(c.toString()));
113113
}
114114
SERIES_SCAN_COST_METRIC_SET.recordSeriesScanCost(
115115
CHUNK_METADATA_MODIFICATION_ALIGNED_DISK, System.nanoTime() - t3);

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/reader/chunk/metadata/DiskChunkMetadataLoader.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class DiskChunkMetadataLoader implements IChunkMetadataLoader {
5050

5151
private final List<Modification> pathModifications;
5252

53-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
53+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
5454
private static final SeriesScanCostMetricSet SERIES_SCAN_COST_METRIC_SET =
5555
SeriesScanCostMetricSet.getInstance();
5656

@@ -83,8 +83,8 @@ public List<IChunkMetadata> loadChunkMetadataList(ITimeSeriesMetadata timeSeries
8383
|| chunkMetaData.getStartTime() > chunkMetaData.getEndTime());
8484

8585
if (context.isDebug()) {
86-
DEBUG_LOGGER.info("After removed by filter Chunk meta data list is: ");
87-
chunkMetadataList.forEach(c -> DEBUG_LOGGER.info(c.toString()));
86+
QUERY_LOGGER.info("After removed by filter Chunk meta data list is: ");
87+
chunkMetadataList.forEach(c -> QUERY_LOGGER.info(c.toString()));
8888
}
8989

9090
SERIES_SCAN_COST_METRIC_SET.recordSeriesScanCost(
@@ -94,20 +94,20 @@ public List<IChunkMetadata> loadChunkMetadataList(ITimeSeriesMetadata timeSeries
9494
final long t3 = System.nanoTime();
9595

9696
if (context.isDebug()) {
97-
DEBUG_LOGGER.info(
97+
QUERY_LOGGER.info(
9898
"Modifications size is {} for file Path: {} ",
9999
pathModifications.size(),
100100
resource.getTsFilePath());
101-
pathModifications.forEach(c -> DEBUG_LOGGER.info(c.toString()));
101+
pathModifications.forEach(c -> QUERY_LOGGER.info(c.toString()));
102102
}
103103

104104
if (!pathModifications.isEmpty()) {
105105
ModificationUtils.modifyChunkMetaData(chunkMetadataList, pathModifications);
106106
}
107107

108108
if (context.isDebug()) {
109-
DEBUG_LOGGER.info("After modification Chunk meta data list is: ");
110-
chunkMetadataList.forEach(c -> DEBUG_LOGGER.info(c.toString()));
109+
QUERY_LOGGER.info("After modification Chunk meta data list is: ");
110+
chunkMetadataList.forEach(c -> QUERY_LOGGER.info(c.toString()));
111111
}
112112

113113
SERIES_SCAN_COST_METRIC_SET.recordSeriesScanCost(

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/tsfile/TsFileResource.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public class TsFileResource {
8787

8888
private static final Logger LOGGER = LoggerFactory.getLogger(TsFileResource.class);
8989

90-
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
90+
private static final Logger QUERY_LOGGER = LoggerFactory.getLogger("QUERY");
9191

9292
private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
9393

@@ -811,7 +811,7 @@ public boolean isDeviceIdExist(IDeviceID deviceId) {
811811
public boolean isSatisfied(IDeviceID deviceId, Filter timeFilter, boolean isSeq, boolean debug) {
812812
if (deviceId != null && definitelyNotContains(deviceId)) {
813813
if (debug) {
814-
DEBUG_LOGGER.info(
814+
QUERY_LOGGER.info(
815815
"Path: {} file {} is not satisfied because of no device!", deviceId, file);
816816
}
817817
return false;
@@ -834,7 +834,7 @@ public boolean isSatisfied(IDeviceID deviceId, Filter timeFilter, boolean isSeq,
834834
}
835835
boolean res = timeFilter.satisfyStartEndTime(startTime, endTime);
836836
if (debug && !res) {
837-
DEBUG_LOGGER.info(
837+
QUERY_LOGGER.info(
838838
"Path: {} file {} is not satisfied because of time filter!",
839839
deviceId != null ? deviceId : "",
840840
fsFactory);

‎iotdb-core/datanode/src/test/resources/datanode1conf/logback.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
<level>INFO</level>
148148
</filter>
149149
</appender>
150-
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY_DEBUG">
151-
<file>${IOTDB_HOME}/logs/log_query_debug.log</file>
150+
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY">
151+
<file>${IOTDB_HOME}/logs/log_QUERY.log</file>
152152
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
153153
<fileNamePattern>${IOTDB_HOME}/logs/log-query-debug-%d{yyyyMMdd}.log.gz</fileNamePattern>
154154
<maxHistory>30</maxHistory>
@@ -239,8 +239,8 @@
239239
<logger level="info" name="IoTDB_AUDIT_LOGGER">
240240
<appender-ref ref="AUDIT"/>
241241
</logger>
242-
<logger level="info" name="QUERY_DEBUG">
243-
<appender-ref ref="QUERY_DEBUG"/>
242+
<logger level="info" name="QUERY">
243+
<appender-ref ref="QUERY"/>
244244
</logger>
245245
<logger level="info" name="SLOW_SQL">
246246
<appender-ref ref="SLOW_SQL"/>

0 commit comments

Comments
 (0)