You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/11/17 11:29:18 UTC
[iotdb] branch rel/0.13 updated: [IOTDB-4946] Change SDT to Upper case (#8030)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 5b03a14c16 [IOTDB-4946] Change SDT to Upper case (#8030)
5b03a14c16 is described below
commit 5b03a14c16e922d97ad79c15178abf590975d837
Author: Marcos_Zyk <38...@users.noreply.github.com>
AuthorDate: Thu Nov 17 19:29:12 2022 +0800
[IOTDB-4946] Change SDT to Upper case (#8030)
---
.../java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java | 4 ++--
.../src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
index 319ee2de8f..39daaa7cc6 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMetadataFetchIT.java
@@ -730,8 +730,8 @@ public class IoTDBMetadataFetchIT {
new HashSet<>(
Arrays.asList(
"root.sg1.d0.s0,null,root.sg1,INT32,RLE,SNAPPY,null,null,null,null,\n",
- "root.sg1.d0.s1,null,root.sg1,INT32,PLAIN,SNAPPY,null,null,sdt,{compdev=2},\n",
- "root.sg1.d0.s2,null,root.sg1,INT32,PLAIN,SNAPPY,null,null,sdt,{compdev=0.01, compmintime=2, compmaxtime=15},\n"));
+ "root.sg1.d0.s1,null,root.sg1,INT32,PLAIN,SNAPPY,null,null,SDT,{compdev=2},\n",
+ "root.sg1.d0.s2,null,root.sg1,INT32,PLAIN,SNAPPY,null,null,SDT,{compdev=0.01, compmintime=2, compmaxtime=15},\n"));
try {
boolean hasResultSet = statement.execute("SHOW TIMESERIES root.sg1.d0.*");
if (hasResultSet) {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java b/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java
index 2e0b09fe44..ecd9cc01ab 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/utils/MetaUtils.java
@@ -34,6 +34,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
@@ -270,6 +271,7 @@ public class MetaUtils {
return new Pair<>(null, null);
}
String deadband = props.get(LOSS);
+ deadband = deadband == null ? null : deadband.toUpperCase(Locale.ROOT);
Map<String, String> deadbandParameters = new HashMap<>();
for (String k : SDT_PARAMETERS) {
if (props.containsKey(k)) {