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 2021/02/06 10:59:54 UTC
[iotdb] branch rel/0.11 updated: alter IoTDBCheckConfigIT to not
change TsFileConfig (#2644)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.11 by this push:
new b708319 alter IoTDBCheckConfigIT to not change TsFileConfig (#2644)
b708319 is described below
commit b708319b44a2942d051316ca40bcb2dacb8d28e3
Author: wangchao316 <66...@users.noreply.github.com>
AuthorDate: Sat Feb 6 18:59:28 2021 +0800
alter IoTDBCheckConfigIT to not change TsFileConfig (#2644)
---
.../iotdb/db/integration/IoTDBCheckConfigIT.java | 26 ++++++++++++++--------
.../iotdb/db/integration/IoTDBEncodingIT.java | 15 +++++--------
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
index 7282701..d4f98e3 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
@@ -18,6 +18,9 @@
*/
package org.apache.iotdb.db.integration;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+
import org.apache.iotdb.db.conf.IoTDBConfigCheck;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
@@ -25,16 +28,23 @@ import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
-import org.junit.*;
-
-import java.io.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
import java.security.AccessControlException;
import java.security.Permission;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import static org.junit.Assert.*;
public class IoTDBCheckConfigIT {
private File propertiesFile = SystemFileFactory.INSTANCE
@@ -107,10 +117,9 @@ public class IoTDBCheckConfigIT {
EnvironmentUtils.shutdownDaemon();
EnvironmentUtils.stopDaemon();
IoTDB.metaManager.clear();
- systemProperties.put("time_encoder", "TS_2DIFF");
+ systemProperties.put("time_encoder", "REGULAR");
writeSystemFile();
EnvironmentUtils.reactiveDaemon();
- tsFileConfig.setTimeEncoder("REGULAR");
try {
IoTDBConfigCheck.getInstance().checkConfig();
} catch (Throwable t) {
@@ -118,7 +127,7 @@ public class IoTDBCheckConfigIT {
} finally {
System.setSecurityManager(null);
}
- assertTrue(bytes.toString().contains("Wrong time_encoder, please set as: TS_2DIFF"));
+ assertTrue(bytes.toString().contains("Wrong time_encoder, please set as: REGULAR"));
}
@Test
@@ -126,8 +135,7 @@ public class IoTDBCheckConfigIT {
EnvironmentUtils.shutdownDaemon();
EnvironmentUtils.stopDaemon();
IoTDB.metaManager.clear();
- systemProperties.put("time_encoder", "REGULAR");
- tsFileConfig.setTimeEncoder("REGULAR");
+ systemProperties.put("time_encoder", "TS_2DIFF");
writeSystemFile();
EnvironmentUtils.reactiveDaemon();
try {
diff --git a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBEncodingIT.java b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBEncodingIT.java
index 6af2453..fba2c98 100644
--- a/server/src/test/java/org/apache/iotdb/db/integration/IoTDBEncodingIT.java
+++ b/server/src/test/java/org/apache/iotdb/db/integration/IoTDBEncodingIT.java
@@ -20,23 +20,22 @@
package org.apache.iotdb.db.integration;
import org.apache.iotdb.db.engine.StorageEngine;
-import org.apache.iotdb.db.exception.StorageEngineException;
-import org.apache.iotdb.db.exception.metadata.IllegalPathException;
-import org.apache.iotdb.db.metadata.PartialPath;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
-import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
public class IoTDBEncodingIT {
@@ -46,7 +45,6 @@ public class IoTDBEncodingIT {
public void setUp() throws Exception {
EnvironmentUtils.closeStatMonitor();
EnvironmentUtils.envSetUp();
- TSFileDescriptor.getInstance().getConfig().setTimeEncoder("REGULAR");
StorageEngine.setEnablePartition(true);
StorageEngine.setTimePartitionInterval(partitionInterval);
insertData();
@@ -59,9 +57,6 @@ public class IoTDBEncodingIT {
EnvironmentUtils.cleanEnv();
}
-
-
-
@Test
public void testSetEncodingRegularFailed() {
try (Connection connection = DriverManager