You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2019/04/17 14:32:53 UTC
[incubator-iotdb] branch refactor_bufferwrite updated: merge with
origin/master
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch refactor_bufferwrite
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/refactor_bufferwrite by this push:
new de8e7e3 merge with origin/master
de8e7e3 is described below
commit de8e7e3d6b1058606663c913a18746edde7a2782
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Apr 17 22:32:43 2019 +0800
merge with origin/master
---
.../java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java | 4 ++--
tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java | 2 +-
.../test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
index 2c15fa7..7ef1001 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/tsfiledata/TsFileProcessor.java
@@ -289,7 +289,7 @@ public class TsFileProcessor extends Processor {
maxWrittenTimeForEachDeviceInCurrentFile.put(deviceId, time);
}
valueCount++;
- BasicMemController.getInstance().reportUse(this, memUsage);
+ BasicMemController.getInstance().acquireUsage(this, memUsage);
checkMemThreshold4Flush(memUsage);
return true;
}
@@ -399,7 +399,7 @@ public class TsFileProcessor extends Processor {
valueCount = 0;
switchWorkToFlush();
long version = versionController.nextVersion();
- BasicMemController.getInstance().reportFree(this, memSize.get());
+ BasicMemController.getInstance().releaseUsage(this, memSize.get());
memSize.set(0);
// switch
flushFuture = FlushManager.getInstance().submit(() -> flushTask(version));
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java
index a3a4236..89aba48 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/ReadOnlyTsFile.java
@@ -28,7 +28,7 @@ import org.apache.iotdb.tsfile.read.expression.QueryExpression;
import org.apache.iotdb.tsfile.read.query.dataset.QueryDataSet;
import org.apache.iotdb.tsfile.read.query.executor.TsFileExecutor;
-public class ReadOnlyTsFile {
+public class ReadOnlyTsFile implements AutoCloseable {
private TsFileSequenceReader fileReader;
private MetadataQuerier metadataQuerier;
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
index 8220c2a..416f2bc 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/TsFileReadWriteTest.java
@@ -49,8 +49,8 @@ import org.junit.Test;
public class TsFileReadWriteTest {
private final double delta = 0.0000001;
- private String path = "read_write_rle.tsfile";
- private File f;
+ String path = "read_write_rle.tsfile";
+ File f;
@Before
public void setUp() throws Exception {