Skip to content

Commit 86351e1

Browse files
shuwenweishuwenwei
committed
add query logger
1 parent 32813d4 commit 86351e1

32 files changed

Lines changed: 79 additions & 54 deletions

File tree

‎example/pipe-count-point-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<groupId>org.apache.maven.plugins</groupId>
6060
<artifactId>maven-jar-plugin</artifactId>
6161
<version>3.2.0</version>
62-
<configuration />
62+
<configuration/>
6363
</plugin>
6464
</plugins>
6565
</build>

‎integration-test/pom.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@
2929
<artifactId>integration-test</artifactId>
3030
<name>IoTDB: Integration-Test</name>
3131
<properties>
32-
<integrationTest.excludedGroups />
32+
<integrationTest.excludedGroups/>
3333
<integrationTest.forkCount>1</integrationTest.forkCount>
34-
<integrationTest.includedGroups />
34+
<integrationTest.includedGroups/>
3535
<integrationTest.launchNodeInSameJVM>true</integrationTest.launchNodeInSameJVM>
3636
<integrationTest.nodeMaxHeapSize>200m</integrationTest.nodeMaxHeapSize>
3737
<integrationTest.nodeNewHeapSize>200m</integrationTest.nodeNewHeapSize>
3838
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
3939
<integrationTest.readAndVerifyWithMultiNode>true</integrationTest.readAndVerifyWithMultiNode>
40-
<integrationTest.testEnv />
40+
<integrationTest.testEnv/>
4141
<lightWeightStandaloneMode.configNodeConsensus>Simple</lightWeightStandaloneMode.configNodeConsensus>
4242
<!-- -DClusterConfigurations values configured here -->
4343
<lightWeightStandaloneMode.configNodeNumber>1</lightWeightStandaloneMode.configNodeNumber>
@@ -388,7 +388,7 @@
388388
<activeByDefault>true</activeByDefault>
389389
</activation>
390390
<properties>
391-
<integrationTest.excludedGroups />
391+
<integrationTest.excludedGroups/>
392392
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.LocalStandaloneIT</integrationTest.includedGroups>
393393
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
394394
<integrationTest.randomSelectWriteNode>false</integrationTest.randomSelectWriteNode>
@@ -403,7 +403,7 @@
403403
<activeByDefault>false</activeByDefault>
404404
</activation>
405405
<properties>
406-
<integrationTest.excludedGroups />
406+
<integrationTest.excludedGroups/>
407407
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.RemoteIT</integrationTest.includedGroups>
408408
<integrationTest.testEnv>Remote</integrationTest.testEnv>
409409
</properties>
@@ -414,7 +414,7 @@
414414
<activeByDefault>false</activeByDefault>
415415
</activation>
416416
<properties>
417-
<integrationTest.excludedGroups />
417+
<integrationTest.excludedGroups/>
418418
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT1,org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema,org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer,org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc,org.apache.iotdb.itbase.category.MultiClusterIT3</integrationTest.includedGroups>
419419
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
420420
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -428,7 +428,7 @@
428428
<activeByDefault>false</activeByDefault>
429429
</activation>
430430
<properties>
431-
<integrationTest.excludedGroups />
431+
<integrationTest.excludedGroups/>
432432
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT1</integrationTest.includedGroups>
433433
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
434434
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -442,7 +442,7 @@
442442
<activeByDefault>false</activeByDefault>
443443
</activation>
444444
<properties>
445-
<integrationTest.excludedGroups />
445+
<integrationTest.excludedGroups/>
446446
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2AutoCreateSchema</integrationTest.includedGroups>
447447
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
448448
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -456,7 +456,7 @@
456456
<activeByDefault>false</activeByDefault>
457457
</activation>
458458
<properties>
459-
<integrationTest.excludedGroups />
459+
<integrationTest.excludedGroups/>
460460
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2ManualCreateSchema</integrationTest.includedGroups>
461461
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
462462
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -470,7 +470,7 @@
470470
<activeByDefault>false</activeByDefault>
471471
</activation>
472472
<properties>
473-
<integrationTest.excludedGroups />
473+
<integrationTest.excludedGroups/>
474474
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionArchVerification</integrationTest.includedGroups>
475475
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
476476
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -484,7 +484,7 @@
484484
<activeByDefault>false</activeByDefault>
485485
</activation>
486486
<properties>
487-
<integrationTest.excludedGroups />
487+
<integrationTest.excludedGroups/>
488488
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionConsumer</integrationTest.includedGroups>
489489
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
490490
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -498,7 +498,7 @@
498498
<activeByDefault>false</activeByDefault>
499499
</activation>
500500
<properties>
501-
<integrationTest.excludedGroups />
501+
<integrationTest.excludedGroups/>
502502
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT2SubscriptionRegressionMisc</integrationTest.includedGroups>
503503
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
504504
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -512,7 +512,7 @@
512512
<activeByDefault>false</activeByDefault>
513513
</activation>
514514
<properties>
515-
<integrationTest.excludedGroups />
515+
<integrationTest.excludedGroups/>
516516
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.MultiClusterIT3</integrationTest.includedGroups>
517517
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
518518
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -526,7 +526,7 @@
526526
<activeByDefault>false</activeByDefault>
527527
</activation>
528528
<properties>
529-
<integrationTest.excludedGroups />
529+
<integrationTest.excludedGroups/>
530530
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.ClusterIT</integrationTest.includedGroups>
531531
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
532532
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>
@@ -540,7 +540,7 @@
540540
<activeByDefault>false</activeByDefault>
541541
</activation>
542542
<properties>
543-
<integrationTest.excludedGroups />
543+
<integrationTest.excludedGroups/>
544544
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.AIClusterIT</integrationTest.includedGroups>
545545
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
546546
<integrationTest.randomSelectWriteNode>false</integrationTest.randomSelectWriteNode>
@@ -554,7 +554,7 @@
554554
<activeByDefault>false</activeByDefault>
555555
</activation>
556556
<properties>
557-
<integrationTest.excludedGroups />
557+
<integrationTest.excludedGroups/>
558558
<integrationTest.includedGroups>org.apache.iotdb.itbase.category.DailyIT</integrationTest.includedGroups>
559559
<integrationTest.launchNodeInSameJVM>false</integrationTest.launchNodeInSameJVM>
560560
<integrationTest.randomSelectWriteNode>true</integrationTest.randomSelectWriteNode>

‎iotdb-client/jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@
238238
</goals>
239239
</pluginExecutionFilter>
240240
<action>
241-
<ignore />
241+
<ignore/>
242242
</action>
243243
</pluginExecution>
244244
</pluginExecutions>

‎iotdb-core/datanode/src/assembly/resources/conf/logback-datanode.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
<level>INFO</level>
193193
</filter>
194194
</appender>
195-
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="COMPACTION">
195+
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="CompactionLog">
196196
<file>${IOTDB_HOME}/logs/compaction.log</file>
197197
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
198198
<fileNamePattern>${IOTDB_HOME}/logs/compaction-%d{yyyyMMdd}.log.gz</fileNamePattern>
@@ -254,7 +254,7 @@
254254
<logger level="info" name="IoTDB_AUDIT_LOGGER">
255255
<appender-ref ref="AUDIT"/>
256256
</logger>
257-
<logger level="info" name="QUERY">
257+
<logger level="info" name="QUERY" additivity="false">
258258
<appender-ref ref="QUERY"/>
259259
</logger>
260260
<logger level="info" name="SLOW_SQL">
@@ -267,8 +267,8 @@
267267
<appender-ref ref="QUERY_FREQUENCY"/>
268268
</logger>
269269
<logger level="info" name="DETAILED_FAILURE_QUERY_TRACE"/>
270-
<logger level="info" name="COMPACTION" addtivity="false">
271-
<appender-ref ref="COMPACTION"/>
270+
<logger level="debug" name="CompactionLog" additivity="false">
271+
<appender-ref ref="CompactionLog"/>
272272
</logger>
273273
<logger level="info" name="org.apache.iotdb.pipe.api" addtivity="false">
274274
<appender-ref ref="PIPE"/>

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package org.apache.iotdb.db.queryengine.execution.driver;
2121

22+
import org.apache.iotdb.commons.conf.IoTDBConstant;
2223
import org.apache.iotdb.commons.utils.FileUtils;
2324
import org.apache.iotdb.db.conf.IoTDBDescriptor;
2425
import org.apache.iotdb.db.queryengine.execution.exchange.sink.ISink;
@@ -59,7 +60,7 @@
5960

6061
public abstract class Driver implements IDriver {
6162

62-
protected static final Logger LOGGER = LoggerFactory.getLogger(Driver.class);
63+
protected static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConstant.QUERY_LOGGER_NAME);
6364
protected static final QueryMetricsManager QUERY_METRICS = QueryMetricsManager.getInstance();
6465
protected static final QueryExecutionMetricSet QUERY_EXECUTION_METRICS =
6566
QueryExecutionMetricSet.getInstance();

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/MPPDataExchangeManager.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.apache.iotdb.common.rpc.thrift.TSStatus;
2424
import org.apache.iotdb.commons.client.IClientManager;
2525
import org.apache.iotdb.commons.client.sync.SyncDataNodeMPPDataExchangeServiceClient;
26+
import org.apache.iotdb.commons.conf.IoTDBConstant;
2627
import org.apache.iotdb.db.queryengine.exception.exchange.GetTsBlockFromClosedOrAbortedChannelException;
2728
import org.apache.iotdb.db.queryengine.execution.driver.DriverContext;
2829
import org.apache.iotdb.db.queryengine.execution.exchange.sink.DownStreamChannelIndex;
@@ -83,7 +84,7 @@
8384

8485
public class MPPDataExchangeManager implements IMPPDataExchangeManager {
8586

86-
private static final Logger LOGGER = LoggerFactory.getLogger(MPPDataExchangeManager.class);
87+
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConstant.QUERY_LOGGER_NAME);
8788

8889
// region =========== MPPDataExchangeServiceImpl ===========
8990

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/MPPDataExchangeService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
2727
import org.apache.iotdb.commons.concurrent.IoTThreadFactory;
2828
import org.apache.iotdb.commons.concurrent.ThreadName;
29+
import org.apache.iotdb.commons.conf.IoTDBConstant;
2930
import org.apache.iotdb.commons.exception.runtime.RPCServiceException;
3031
import org.apache.iotdb.commons.service.ServiceType;
3132
import org.apache.iotdb.commons.service.ThriftService;
@@ -46,7 +47,7 @@
4647

4748
public class MPPDataExchangeService extends ThriftService implements MPPDataExchangeServiceMBean {
4849

49-
private static final Logger LOGGER = LoggerFactory.getLogger(MPPDataExchangeService.class);
50+
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConstant.QUERY_LOGGER_NAME);
5051

5152
private final MPPDataExchangeManager mppDataExchangeManager;
5253
private final ExecutorService executorService;

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/sink/LocalSinkChannel.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package org.apache.iotdb.db.queryengine.execution.exchange.sink;
2121

22+
import org.apache.iotdb.commons.conf.IoTDBConstant;
2223
import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager.SinkListener;
2324
import org.apache.iotdb.db.queryengine.execution.exchange.SharedTsBlockQueue;
2425
import org.apache.iotdb.db.queryengine.metric.DataExchangeCostMetricSet;
@@ -39,7 +40,7 @@
3940

4041
public class LocalSinkChannel implements ISinkChannel {
4142

42-
private static final Logger LOGGER = LoggerFactory.getLogger(LocalSinkChannel.class);
43+
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConstant.QUERY_LOGGER_NAME);
4344

4445
private TFragmentInstanceId localFragmentInstanceId;
4546
private final SinkListener sinkListener;

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/sink/ShuffleSinkHandle.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package org.apache.iotdb.db.queryengine.execution.exchange.sink;
2121

22+
import org.apache.iotdb.commons.conf.IoTDBConstant;
2223
import org.apache.iotdb.db.conf.IoTDBDescriptor;
2324
import org.apache.iotdb.db.queryengine.execution.exchange.MPPDataExchangeManager;
2425
import org.apache.iotdb.db.queryengine.metric.DataExchangeCostMetricSet;
@@ -39,7 +40,7 @@
3940

4041
public class ShuffleSinkHandle implements ISinkHandle {
4142

42-
private static final Logger LOGGER = LoggerFactory.getLogger(ShuffleSinkHandle.class);
43+
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConstant.QUERY_LOGGER_NAME);
4344

4445
/** Each ISinkChannel in the list matches one downstream ISourceHandle. */
4546
private final List<ISinkChannel> downStreamChannelList;

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/exchange/sink/SinkChannel.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
2323
import org.apache.iotdb.commons.client.IClientManager;
2424
import org.apache.iotdb.commons.client.sync.SyncDataNodeMPPDataExchangeServiceClient;
25+
import org.apache.iotdb.commons.conf.IoTDBConstant;
2526
import org.apache.iotdb.commons.utils.TestOnly;
2627
import org.apache.iotdb.db.conf.IoTDBDescriptor;
2728
import org.apache.iotdb.db.queryengine.common.FragmentInstanceId;
@@ -64,7 +65,7 @@
6465

6566
public class SinkChannel implements ISinkChannel {
6667

67-
private static final Logger LOGGER = LoggerFactory.getLogger(SinkChannel.class);
68+
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBConstant.QUERY_LOGGER_NAME);
6869

6970
public static final int MAX_ATTEMPT_TIMES = 3;
7071
private static final long DEFAULT_RETRY_INTERVAL_IN_MS = 1000L;

0 commit comments

Comments
 (0)