You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2020/11/09 10:57:47 UTC
[iotdb] branch TyTagBug created (now ac0bf68)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch TyTagBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at ac0bf68 check if the tag key or value is empty
This branch includes the following new commits:
new 3af25e8 init
new ac0bf68 check if the tag key or value is empty
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/02: init
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch TyTagBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 3af25e85cee561385d38759db19c0acea8f9c747
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Mon Nov 9 17:53:57 2020 +0800
init
---
grafana/pom.xml | 2 +-
jdbc/pom.xml | 2 +-
pom.xml | 6 +++---
server/src/main/java/org/apache/iotdb/db/metadata/MManager.java | 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/grafana/pom.xml b/grafana/pom.xml
index 26425ed..350a5f2 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 9d2eac1..9b9d4a7 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 fd734d4..99c7b73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -139,7 +139,7 @@
<sonar.exclusions>**/generated-sources</sonar.exclusions>
<!-- By default, the argLine is empty-->
<gson.version>2.8.6</gson.version>
- <argLine />
+ <argLine/>
</properties>
<!--
if we claim dependencies in dependencyManagement, then we do not claim
@@ -599,7 +599,7 @@
<id>enforce-version-convergence</id>
<configuration>
<rules>
- <dependencyConvergence />
+ <dependencyConvergence/>
</rules>
</configuration>
<goals>
@@ -645,7 +645,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/main/java/org/apache/iotdb/db/metadata/MManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index bad02fd..f9bb13e 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -430,6 +430,9 @@ public class MManager {
if (plan.getTags() != null) {
// tag key, tag value
for (Entry<String, String> entry : plan.getTags().entrySet()) {
+ if (entry.getKey() == null || entry.getValue() == null) {
+ continue;
+ }
tagIndex.computeIfAbsent(entry.getKey(), k -> new ConcurrentHashMap<>())
.computeIfAbsent(entry.getValue(), v -> new CopyOnWriteArraySet<>()).add(leafMNode);
}
[iotdb] 02/02: check if the tag key or value is empty
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch TyTagBug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit ac0bf68f3a8e2925c0efc6de99d2ea24a613da25
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Mon Nov 9 18:57:20 2020 +0800
check if the tag key or value is empty
---
.../org/apache/iotdb/db/metadata/TagLogFile.java | 26 ++++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/TagLogFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/TagLogFile.java
index a2c52dc..4af3694 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/TagLogFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/TagLogFile.java
@@ -40,7 +40,8 @@ public class TagLogFile implements AutoCloseable {
private static final String LENGTH_EXCEED_MSG = "Tag/Attribute exceeds the max length limit. "
+ "Please enlarge tag_attribute_total_size in iotdb-engine.properties";
- private static final int MAX_LENGTH = IoTDBDescriptor.getInstance().getConfig().getTagAttributeTotalSize();
+ private static final int MAX_LENGTH = IoTDBDescriptor.getInstance().getConfig()
+ .getTagAttributeTotalSize();
private static final byte FILL_BYTE = 0;
@@ -57,7 +58,9 @@ public class TagLogFile implements AutoCloseable {
File logFile = SystemFileFactory.INSTANCE.getFile(schemaDir + File.separator + logFileName);
- this.fileChannel = FileChannel.open(logFile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.DSYNC);
+ this.fileChannel = FileChannel
+ .open(logFile.toPath(), StandardOpenOption.READ, StandardOpenOption.WRITE,
+ StandardOpenOption.CREATE, StandardOpenOption.DSYNC);
// move the current position to the tail of the file
this.fileChannel.position(fileChannel.size());
}
@@ -65,7 +68,8 @@ public class TagLogFile implements AutoCloseable {
/**
* @return tags map, attributes map
*/
- public Pair<Map<String, String>, Map<String, String>> read(int size, long position) throws IOException {
+ public Pair<Map<String, String>, Map<String, String>> read(int size, long position)
+ throws IOException {
if (position < 0) {
return new Pair<>(Collections.emptyMap(), Collections.emptyMap());
}
@@ -82,7 +86,8 @@ public class TagLogFile implements AutoCloseable {
return ReadWriteIOUtils.readMap(byteBuffer);
}
- public long write(Map<String, String> tagMap, Map<String, String> attributeMap) throws IOException, MetadataException {
+ public long write(Map<String, String> tagMap, Map<String, String> attributeMap)
+ throws IOException, MetadataException {
long offset = fileChannel.position();
ByteBuffer byteBuffer = convertMapToByteBuffer(tagMap, attributeMap);
fileChannel.write(byteBuffer);
@@ -92,12 +97,14 @@ public class TagLogFile implements AutoCloseable {
/**
* This method does not modify this file's current position.
*/
- public void write(Map<String, String> tagMap, Map<String, String> attributeMap, long position) throws IOException, MetadataException {
+ public void write(Map<String, String> tagMap, Map<String, String> attributeMap, long position)
+ throws IOException, MetadataException {
ByteBuffer byteBuffer = convertMapToByteBuffer(tagMap, attributeMap);
fileChannel.write(byteBuffer, position);
}
- private ByteBuffer convertMapToByteBuffer(Map<String, String> tagMap, Map<String, String> attributeMap) throws MetadataException {
+ private ByteBuffer convertMapToByteBuffer(Map<String, String> tagMap,
+ Map<String, String> attributeMap) throws MetadataException {
ByteBuffer byteBuffer = ByteBuffer.allocate(MAX_LENGTH);
int length = serializeMap(tagMap, byteBuffer, 0);
length = serializeMap(attributeMap, byteBuffer, length);
@@ -112,7 +119,8 @@ public class TagLogFile implements AutoCloseable {
return byteBuffer;
}
- private int serializeMap(Map<String, String> map, ByteBuffer byteBuffer, int length) throws MetadataException {
+ private int serializeMap(Map<String, String> map, ByteBuffer byteBuffer, int length)
+ throws MetadataException {
if (map == null) {
length += Integer.BYTES;
if (length > MAX_LENGTH) {
@@ -128,6 +136,10 @@ public class TagLogFile implements AutoCloseable {
ReadWriteIOUtils.write(map.size(), byteBuffer);
byte[] bytes;
for (Map.Entry<String, String> entry : map.entrySet()) {
+ if (entry.getKey() == null || entry.getKey().isEmpty() || entry.getValue() == null || entry
+ .getValue().isEmpty()) {
+ throw new MetadataException("Tag key or value shouldn't be null or empty string.");
+ }
// serialize key
bytes = entry.getKey().getBytes();
length += (4 + bytes.length);