You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ea...@apache.org on 2020/06/08 03:13:49 UTC
[incubator-iotdb] 03/04: fix ut bug
This is an automated email from the ASF dual-hosted git repository.
east pushed a commit to branch nvmlogging
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit ee34ce56dab81313fe83b346398c37374a24e90d
Author: mdf369 <95...@qq.com>
AuthorDate: Mon Jun 8 10:44:19 2020 +0800
fix ut bug
---
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../apache/iotdb/db/utils/datastructure/NVMBinaryTVList.java | 2 +-
.../org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java | 5 +++++
.../db/writelog/recover/RecoverResourceFromReaderTest.java | 6 ++++++
.../iotdb/db/writelog/recover/SeqTsFileRecoverTest.java | 11 +++++++++++
.../iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java | 6 ++++++
6 files changed, 30 insertions(+), 2 deletions(-)
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 6741805..f0c3b04 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
@@ -190,7 +190,7 @@ public class IoTDBConfig {
/**
* Is NVM enable.
*/
- private boolean enableNVM = true;
+ private boolean enableNVM = false;
/**
* NVM directory.
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/NVMBinaryTVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/NVMBinaryTVList.java
index 9087abd..b9e36ff 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/NVMBinaryTVList.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/NVMBinaryTVList.java
@@ -174,7 +174,7 @@ public class NVMBinaryTVList extends NVMTVList {
@Override
protected void setValueForSort(int arrayIndex, int elementIndex, Object value) {
- tempValuesForSort[arrayIndex * ARRAY_SIZE + elementIndex][0] = (Binary) value;
+ tempValuesForSort[arrayIndex][elementIndex] = (Binary) value;
}
@Override
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
index 7125d88..4d2d6f6 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeManagerTest.java
@@ -75,6 +75,11 @@ public class WriteLogNodeManagerTest {
@Test
public void testAutoSync() throws IOException, InterruptedException {
+ // This UT is for WAL, but WAL is disabled when using NVM, so just ignore.
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableNVM()) {
+ return;
+ }
+
// this test check that nodes in a manager will sync periodically.
int flushWalPeriod = config.getFlushWalThreshold();
config.setForceWalPeriodInMs(10000);
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java
index 1a4857d..129c397 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/RecoverResourceFromReaderTest.java
@@ -27,6 +27,7 @@ import java.io.OutputStream;
import java.util.Collections;
import org.apache.commons.io.FileUtils;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
@@ -172,6 +173,11 @@ public class RecoverResourceFromReaderTest {
@Test
public void testResourceRecovery() throws StorageGroupProcessorException, IOException {
+ // This UT recovers data by WAL, but WAL is disabled when using NVM, so just ignore.
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableNVM()) {
+ return;
+ }
+
// write a broken resourceFile
File resourceFile = FSFactoryProducer.getFSFactory()
.getFile(resource.getFile() + TsFileResource.RESOURCE_SUFFIX);
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
index c448855..21cde4e 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
@@ -31,6 +31,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.io.FileUtils;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
@@ -169,6 +170,11 @@ public class SeqTsFileRecoverTest {
@Test
public void testNonLastRecovery() throws StorageGroupProcessorException, IOException {
+ // This UT recovers data by WAL, but WAL is disabled when using NVM, so just ignore.
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableNVM()) {
+ return;
+ }
+
TsFileRecoverPerformer performer = new TsFileRecoverPerformer(logNodePrefix,
versionController, resource, true, false, "root.sg");
ActiveTimeSeriesCounter.getInstance().init(storageGroup);
@@ -218,6 +224,11 @@ public class SeqTsFileRecoverTest {
@Test
public void testLastRecovery() throws StorageGroupProcessorException, IOException {
+ // This UT recovers data by WAL, but WAL is disabled when using NVM, so just ignore.
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableNVM()) {
+ return;
+ }
+
TsFileRecoverPerformer performer = new TsFileRecoverPerformer(logNodePrefix,
versionController, resource, true, true, "root.sg");
ActiveTimeSeriesCounter.getInstance().init(storageGroup);
diff --git a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
index 1e34e5b..b9f84ae 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
@@ -25,6 +25,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Collections;
import org.apache.commons.io.FileUtils;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
@@ -177,6 +178,11 @@ public class UnseqTsFileRecoverTest {
@Test
public void test() throws StorageGroupProcessorException, IOException {
+ // This UT recovers data by WAL, but WAL is disabled when using NVM, so just ignore.
+ if (IoTDBDescriptor.getInstance().getConfig().isEnableNVM()) {
+ return;
+ }
+
TsFileRecoverPerformer performer = new TsFileRecoverPerformer(logNodePrefix,
versionController, resource, true, false, "root.sg");
ActiveTimeSeriesCounter.getInstance()