This is an automated email from the ASF dual-hosted git repository. jiangtian pushed a commit to branch refactor_overflow in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 245cc54f7739ef3fb6a83b7447c60d213fe1a32d Author: 江天 <[email protected]> AuthorDate: Tue May 28 12:50:27 2019 +0800 rename StorageEngine to DatabaseEngine --- .../engine/{sgmanager/StorageEngine.java => DatabaseEngine.java} | 6 +++--- .../StorageEngineFactory.java => DatabaseEngineFactory.java} | 8 +++++--- .../org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageEngine.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngine.java similarity index 97% rename from iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageEngine.java rename to iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngine.java index 72c7dcf..7dc436e 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageEngine.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngine.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.iotdb.db.engine.sgmanager; +package org.apache.iotdb.db.engine; import java.util.List; import java.util.Map; @@ -34,9 +34,9 @@ import org.apache.iotdb.tsfile.read.common.Path; import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression; /** - * StorageEngine is an abstraction of IoTDB storage-level interfaces. + * DatabaseEngine is an abstraction of IoTDB storage-level interfaces. */ -public interface StorageEngine { +public interface DatabaseEngine { /** * This function is just for unit test. diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageEngineFactory.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngineFactory.java similarity index 82% rename from iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageEngineFactory.java rename to iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngineFactory.java index 85218a7..f67ef54 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageEngineFactory.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/DatabaseEngineFactory.java @@ -17,11 +17,13 @@ * under the License. */ -package org.apache.iotdb.db.engine.sgmanager; +package org.apache.iotdb.db.engine; -public class StorageEngineFactory { +import org.apache.iotdb.db.engine.sgmanager.StorageGroupManager; - public static StorageEngine getCurrent() { +public class DatabaseEngineFactory { + + public static DatabaseEngine getCurrent() { return StorageGroupManager.getInstance(); } } diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java index 22d37b8..b1488cc 100644 --- a/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java +++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/sgmanager/StorageGroupManager.java @@ -36,6 +36,7 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBConstant; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.conf.directories.Directories; +import org.apache.iotdb.db.engine.DatabaseEngine; import org.apache.iotdb.db.engine.filenode.TsFileResource; import org.apache.iotdb.db.engine.memcontrol.BasicMemController; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; @@ -67,7 +68,7 @@ import org.slf4j.LoggerFactory; * StorageGroupManager provides top-level interfaces to access IoTDB storage engine. It decides * which StorageGroup(s) to access in order to complete a query. */ -public class StorageGroupManager implements IStatistic, IService, StorageEngine { +public class StorageGroupManager implements IStatistic, IService, DatabaseEngine { private static final Logger LOGGER = LoggerFactory.getLogger(StorageGroupManager.class); private static final IoTDBConfig TsFileDBConf = IoTDBDescriptor.getInstance().getConfig();
