This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ZYBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/ZYBug by this push:
new e52ef3e add trigger
e52ef3e is described below
commit e52ef3ec3c11ad20331a1f02c09e5ae9b0fe0e4e
Author: JackieTien97 <[email protected]>
AuthorDate: Fri Oct 23 19:31:22 2020 +0800
add trigger
---
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
pom.xml | 6 +-
.../resources/conf/iotdb-engine.properties | 2 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +++
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 19 ++++--
.../apache/iotdb/db/engine/cache/ChunkCache.java | 5 +-
.../iotdb/db/engine/cache/ChunkMetadataCache.java | 10 ++-
.../db/engine/cache/TimeSeriesMetadataCache.java | 15 +++--
.../engine/storagegroup/StorageGroupProcessor.java | 73 ++++++++++++----------
service-rpc/pom.xml | 2 +-
11 files changed, 92 insertions(+), 54 deletions(-)
diff --git a/grafana/pom.xml b/grafana/pom.xml
index cd0a7ce..76633ce 100644
--- a/grafana/pom.xml
+++ b/grafana/pom.xml
@@ -165,7 +165,7 @@
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
- <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>${start-class}</mainClass>
</transformer>
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index f2f3cc3..a6fddbe 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -223,7 +223,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/pom.xml b/pom.xml
index eec68bd..b23d776 100644
--- a/pom.xml
+++ b/pom.xml
@@ -133,7 +133,7 @@
<!-- Exclude all generated code -->
<sonar.exclusions>**/generated-sources</sonar.exclusions>
<!-- By default, the argLine is empty-->
- <argLine />
+ <argLine/>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim
@@ -1004,7 +1004,7 @@
<id>enforce-version-convergence</id>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -1050,7 +1050,7 @@
</requireJavaVersion>
<!-- Disabled for now as it breaks the
ability to build single modules -->
<!--reactorModuleConvergence/-->
- <banVulnerable
implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"
/>
+ <banVulnerable
implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies"/>
</rules>
</configuration>
</execution>
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index a5d8e2c..dd8152c 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -502,3 +502,5 @@
authorizer_provider_class=org.apache.iotdb.db.auth.authorizer.LocalFileAuthorize
#openID_url=
+zy_on=false
+
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 2da037f..7cba056 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -600,6 +600,8 @@ public class IoTDBConfig {
// time in nanosecond precision when starting up
private long startUpNanosecond = System.nanoTime();
+ private volatile boolean ZY_ON = false;
+
public IoTDBConfig() {
// empty constructor
}
@@ -1648,4 +1650,12 @@ public class IoTDBConfig {
public long getStartUpNanosecond() {
return startUpNanosecond;
}
+
+ public boolean isZY_ON() {
+ return ZY_ON;
+ }
+
+ public void setZY_ON(boolean ZY_ON) {
+ this.ZY_ON = ZY_ON;
+ }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index c5854ea..4a837a2 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -428,6 +428,8 @@ public class IoTDBDescriptor {
//if using org.apache.iotdb.db.auth.authorizer.OpenIdAuthorizer,
openID_url is needed.
conf.setOpenIdProviderUrl(properties.getProperty("openID_url", ""));
+ conf.setZY_ON(
+ Boolean.parseBoolean(properties.getProperty("zy_on",
Boolean.toString(conf.isZY_ON()))));
// At the same time, set TSFileConfig
TSFileDescriptor.getInstance().getConfig()
@@ -493,12 +495,15 @@ public class IoTDBDescriptor {
conf.setAutoCreateSchemaEnabled(
Boolean.parseBoolean(properties.getProperty("enable_auto_create_schema",
Boolean.toString(conf.isAutoCreateSchemaEnabled()).trim())));
-
conf.setBooleanStringInferType(TSDataType.valueOf(properties.getProperty("boolean_string_infer_type",
- conf.getBooleanStringInferType().toString())));
-
conf.setIntegerStringInferType(TSDataType.valueOf(properties.getProperty("integer_string_infer_type",
- conf.getIntegerStringInferType().toString())));
-
conf.setFloatingStringInferType(TSDataType.valueOf(properties.getProperty("floating_string_infer_type",
- conf.getFloatingStringInferType().toString())));
+ conf.setBooleanStringInferType(
+ TSDataType.valueOf(properties.getProperty("boolean_string_infer_type",
+ conf.getBooleanStringInferType().toString())));
+ conf.setIntegerStringInferType(
+ TSDataType.valueOf(properties.getProperty("integer_string_infer_type",
+ conf.getIntegerStringInferType().toString())));
+ conf.setFloatingStringInferType(
+ TSDataType.valueOf(properties.getProperty("floating_string_infer_type",
+ conf.getFloatingStringInferType().toString())));
conf.setNanStringInferType(TSDataType.valueOf(properties.getProperty("nan_string_infer_type",
conf.getNanStringInferType().toString())));
conf.setDefaultStorageGroupLevel(
@@ -617,6 +622,8 @@ public class IoTDBDescriptor {
conf.setMemtableSizeThreshold(memTableSizeThreshold);
}
+ conf.setZY_ON(Boolean.parseBoolean(properties.getProperty("zy_on")));
+
// update params of creating schema automatically
loadAutoCreateSchemaProps(properties);
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
index 891794e..ccb235b 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
@@ -116,8 +116,9 @@ public class ChunkCache {
lock.writeLock().unlock();
}
}
-
- BUG_LOGGER.info("get chunk from cache whose meta data is: " +
chunkMetaData);
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info("get chunk from cache whose meta data is: " +
chunkMetaData);
+ }
return new Chunk(chunk.getHeader(), chunk.getData().duplicate(),
chunk.getDeletedAt());
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
index 43a35f1..dcb8896 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkMetadataCache.java
@@ -148,7 +148,9 @@ public class ChunkMetadataCache {
TsFileSequenceReader tsFileReader =
FileReaderManager.getInstance().get(filePath, true);
BloomFilter bloomFilter = tsFileReader.readBloomFilter();
if (bloomFilter != null &&
!bloomFilter.contains(seriesPath.getFullPath())) {
- BUG_LOGGER.info("Chunk meta data " + key.getString() + " is filter by
bloomFilter!");
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info("Chunk meta data " + key.getString() + " is filter
by bloomFilter!");
+ }
return new ArrayList<>();
}
chunkMetadataList = FileLoaderUtils.getChunkMetadataList(seriesPath,
filePath);
@@ -159,8 +161,10 @@ public class ChunkMetadataCache {
lock.writeLock().unlock();
}
}
- BUG_LOGGER.info("Chunk meta data list size: " + chunkMetadataList.size() +
" key is: " + key.getString());
- chunkMetadataList.forEach(c -> BUG_LOGGER.info(c.toString()));
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info("Chunk meta data list size: " + chunkMetadataList.size()
+ " key is: " + key.getString());
+ chunkMetadataList.forEach(c -> BUG_LOGGER.info(c.toString()));
+ }
return new ArrayList<>(chunkMetadataList);
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
index 01bc099..3806658 100644
---
a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
@@ -145,8 +145,9 @@ public class TimeSeriesMetadataCache {
BloomFilter bloomFilter = reader.readBloomFilter();
if (bloomFilter != null && !bloomFilter
.contains(key.device + IoTDBConstant.PATH_SEPARATOR +
key.measurement)) {
-
- BUG_LOGGER.info("TimeSeries meta data " + key + " is filter by
bloomFilter!");
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info("TimeSeries meta data " + key + " is filter by
bloomFilter!");
+ }
return null;
}
List<TimeseriesMetadata> timeSeriesMetadataList = reader
@@ -165,10 +166,16 @@ public class TimeSeriesMetadataCache {
}
}
if (timeseriesMetadata == null) {
- BUG_LOGGER.info("The file doesn't this time series " + key);
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info("The file doesn't this time series " + key);
+ }
return null;
} else {
- BUG_LOGGER.info("Get timeseries: " + key.device + "." + key.measurement
+ " metadata in file: " + key.filePath + " from cache: " + timeseriesMetadata);
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info(
+ "Get timeseries: " + key.device + "." + key.measurement + "
metadata in file: "
+ + key.filePath + " from cache: " + timeseriesMetadata);
+ }
return new TimeseriesMetadata(timeseriesMetadata);
}
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 71bbe8f..5db2f59 100755
---
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -1155,43 +1155,50 @@ public class StorageGroupProcessor {
insertLock.readLock().lock();
mergeLock.readLock().lock();
try {
- BUG_LOGGER.info("time filter: " + timeFilter);
- BUG_LOGGER.info("sequenceFileTreeSet size: " +
sequenceFileTreeSet.size());
- sequenceFileTreeSet.forEach(v -> {
- BUG_LOGGER.info("isSeq: " + v.isSeq());
- BUG_LOGGER.info("isClosed: " + v.isClosed());
- BUG_LOGGER.info("deviceId: " + deviceId);
- BUG_LOGGER.info("startTime: " + v.getStartTime(deviceId));
- BUG_LOGGER.info("endTime: " + v.getEndTime(deviceId));
- });
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info("time filter: " + timeFilter);
+ BUG_LOGGER.info("sequenceFileTreeSet size: " +
sequenceFileTreeSet.size());
+ sequenceFileTreeSet.forEach(v -> {
+ BUG_LOGGER.info("isSeq: " + v.isSeq());
+ BUG_LOGGER.info("isClosed: " + v.isClosed());
+ BUG_LOGGER.info("deviceId: " + deviceId);
+ BUG_LOGGER.info("startTime: " + v.getStartTime(deviceId));
+ BUG_LOGGER.info("endTime: " + v.getEndTime(deviceId));
+ });
+ }
List<TsFileResource> seqResources =
getFileResourceListForQuery(sequenceFileTreeSet,
upgradeSeqFileList, deviceId, measurementId, context, timeFilter,
true);
- BUG_LOGGER.info("seqResources size: " + seqResources.size());
- seqResources.forEach(v -> {
- BUG_LOGGER.info("isSeq: " + v.isSeq());
- BUG_LOGGER.info("isClosed: " + v.isClosed());
- BUG_LOGGER.info("deviceId: " + deviceId);
- BUG_LOGGER.info("startTime: " + v.getStartTime(deviceId));
- BUG_LOGGER.info("endTime: " + v.getEndTime(deviceId));
- });
- BUG_LOGGER.info("unSequenceFileList size: " + unSequenceFileList.size());
- unSequenceFileList.forEach(v -> {
- BUG_LOGGER.info("isSeq: " + v.isSeq());
- BUG_LOGGER.info("isClosed: " + v.isClosed());
- BUG_LOGGER.info("deviceId: " + deviceId);
- BUG_LOGGER.info("startTime: " + v.getStartTime(deviceId));
- BUG_LOGGER.info("endTime: " + v.getEndTime(deviceId));
- });
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info("seqResources size: " + seqResources.size());
+ seqResources.forEach(v -> {
+ BUG_LOGGER.info("isSeq: " + v.isSeq());
+ BUG_LOGGER.info("isClosed: " + v.isClosed());
+ BUG_LOGGER.info("deviceId: " + deviceId);
+ BUG_LOGGER.info("startTime: " + v.getStartTime(deviceId));
+ BUG_LOGGER.info("endTime: " + v.getEndTime(deviceId));
+ });
+ BUG_LOGGER.info("unSequenceFileList size: " +
unSequenceFileList.size());
+ unSequenceFileList.forEach(v -> {
+ BUG_LOGGER.info("isSeq: " + v.isSeq());
+ BUG_LOGGER.info("isClosed: " + v.isClosed());
+ BUG_LOGGER.info("deviceId: " + deviceId);
+ BUG_LOGGER.info("startTime: " + v.getStartTime(deviceId));
+ BUG_LOGGER.info("endTime: " + v.getEndTime(deviceId));
+ });
+ }
+
List<TsFileResource> unseqResources =
getFileResourceListForQuery(unSequenceFileList,
upgradeUnseqFileList, deviceId, measurementId, context, timeFilter,
false);
- BUG_LOGGER.info("unSequenceFileList size: " + unSequenceFileList.size());
- unseqResources.forEach(v -> {
- BUG_LOGGER.info("isSeq: " + v.isSeq());
- BUG_LOGGER.info("isClosed: " + v.isClosed());
- BUG_LOGGER.info("deviceId: " + deviceId);
- BUG_LOGGER.info("startTime: " + v.getStartTime(deviceId));
- BUG_LOGGER.info("endTime: " + v.getEndTime(deviceId));
- });
+ if (IoTDBDescriptor.getInstance().getConfig().isZY_ON()) {
+ BUG_LOGGER.info("unSequenceFileList size: " +
unSequenceFileList.size());
+ unseqResources.forEach(v -> {
+ BUG_LOGGER.info("isSeq: " + v.isSeq());
+ BUG_LOGGER.info("isClosed: " + v.isClosed());
+ BUG_LOGGER.info("deviceId: " + deviceId);
+ BUG_LOGGER.info("startTime: " + v.getStartTime(deviceId));
+ BUG_LOGGER.info("endTime: " + v.getEndTime(deviceId));
+ });
+ }
QueryDataSource dataSource = new QueryDataSource(new Path(deviceId,
measurementId),
seqResources, unseqResources);
// used files should be added before mergeLock is unlocked, or they may
be deleted by
diff --git a/service-rpc/pom.xml b/service-rpc/pom.xml
index b6f9a7d..dad2dd7 100644
--- a/service-rpc/pom.xml
+++ b/service-rpc/pom.xml
@@ -208,7 +208,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <ignore />
+ <ignore/>
</action>
</pluginExecution>
<pluginExecution>
