You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2019/07/10 01:06:16 UTC
[incubator-iotdb] branch dev_merge created (now 263eb29)
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a change to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git.
at 263eb29 add merge framework
This branch includes the following new commits:
new 263eb29 add merge framework
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-iotdb] 01/01: add merge framework
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch dev_merge
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 263eb2974e67aef9bcc90e94f99fe34f8da8bf03
Author: 江天 <jt...@163.com>
AuthorDate: Wed Jul 10 09:04:00 2019 +0800
add merge framework
---
iotdb/src/main/java/org/apache/iotdb/db/engine/merge/MergeTask.java | 5 +++++
iotdb/src/main/java/org/apache/iotdb/db/engine/merge/MergeUtils.java | 5 +++++
.../src/main/java/org/apache/iotdb/db/engine/merge/package-info.java | 1 +
3 files changed, 11 insertions(+)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/MergeTask.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/MergeTask.java
new file mode 100644
index 0000000..3ace4f3
--- /dev/null
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/MergeTask.java
@@ -0,0 +1,5 @@
+package org.apache.iotdb.db.engine.merge;
+
+public class MergeTask {
+
+}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/MergeUtils.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/MergeUtils.java
new file mode 100644
index 0000000..c309703
--- /dev/null
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/MergeUtils.java
@@ -0,0 +1,5 @@
+package org.apache.iotdb.db.engine.merge;
+
+public class MergeUtils {
+
+}
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/package-info.java b/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/package-info.java
new file mode 100644
index 0000000..72af704
--- /dev/null
+++ b/iotdb/src/main/java/org/apache/iotdb/db/engine/merge/package-info.java
@@ -0,0 +1 @@
+package org.apache.iotdb.db.engine.merge;
\ No newline at end of file