You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2021/06/29 02:55:11 UTC
[iotdb] branch master updated: Move package
'org.apache.iotdb.db.sink' to 'org.apache.iotdb.db.engine.trigger.sink'
(#3465)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 139c6ba Move package 'org.apache.iotdb.db.sink' to 'org.apache.iotdb.db.engine.trigger.sink' (#3465)
139c6ba is described below
commit 139c6bab7b295042636c2d3c36187b8935e13358
Author: Steve Yurong Su (宇荣) <ro...@apache.org>
AuthorDate: Mon Jun 28 21:54:52 2021 -0500
Move package 'org.apache.iotdb.db.sink' to 'org.apache.iotdb.db.engine.trigger.sink' (#3465)
---
docs/UserGuide/Advanced-Features/Triggers.md | 16 ++++++++--------
docs/zh/UserGuide/Advanced-Features/Triggers.md | 16 ++++++++--------
.../java/org/apache/iotdb/trigger/AlertingExample.java | 6 +++---
.../java/org/apache/iotdb/trigger/TriggerExample.java | 12 ++++++------
.../sink/alertmanager/AlertManagerConfiguration.java | 4 ++--
.../trigger}/sink/alertmanager/AlertManagerEvent.java | 6 +++---
.../trigger}/sink/alertmanager/AlertManagerHandler.java | 6 +++---
.../db/{ => engine/trigger}/sink/api/Configuration.java | 2 +-
.../iotdb/db/{ => engine/trigger}/sink/api/Event.java | 2 +-
.../iotdb/db/{ => engine/trigger}/sink/api/Handler.java | 2 +-
.../trigger}/sink/exception/SinkException.java | 2 +-
.../trigger}/sink/local/LocalIoTDBConfiguration.java | 4 ++--
.../{ => engine/trigger}/sink/local/LocalIoTDBEvent.java | 4 ++--
.../trigger}/sink/local/LocalIoTDBHandler.java | 6 +++---
.../trigger}/sink/mqtt/MQTTConfiguration.java | 4 ++--
.../db/{ => engine/trigger}/sink/mqtt/MQTTEvent.java | 4 ++--
.../db/{ => engine/trigger}/sink/mqtt/MQTTHandler.java | 6 +++---
.../java/org/apache/iotdb/db/sink/AlertManagerTest.java | 6 +++---
.../org/apache/iotdb/db/sink/LocalIoTDBSinkTest.java | 6 +++---
.../test/java/org/apache/iotdb/db/sink/MQTTSinkTest.java | 6 +++---
20 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/docs/UserGuide/Advanced-Features/Triggers.md b/docs/UserGuide/Advanced-Features/Triggers.md
index c96e5f8..3dffb17 100644
--- a/docs/UserGuide/Advanced-Features/Triggers.md
+++ b/docs/UserGuide/Advanced-Features/Triggers.md
@@ -699,12 +699,12 @@ package org.apache.iotdb.trigger;
import org.apache.iotdb.db.engine.trigger.api.Trigger;
import org.apache.iotdb.db.engine.trigger.api.TriggerAttributes;
import org.apache.iotdb.db.metadata.PartialPath;
-import org.apache.iotdb.db.sink.mqtt.MQTTConfiguration;
-import org.apache.iotdb.db.sink.mqtt.MQTTEvent;
-import org.apache.iotdb.db.sink.mqtt.MQTTHandler;
-import org.apache.iotdb.db.sink.local.LocalIoTDBConfiguration;
-import org.apache.iotdb.db.sink.local.LocalIoTDBEvent;
-import org.apache.iotdb.db.sink.local.LocalIoTDBHandler;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTEvent;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTHandler;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBEvent;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBHandler;
import org.apache.iotdb.db.utils.windowing.configuration.SlidingSizeWindowConfiguration;
import org.apache.iotdb.db.utils.windowing.handler.SlidingSizeWindowEvaluationHandler;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -786,7 +786,7 @@ public class TriggerExample implements Trigger {
private void openSinkHandlers() throws Exception {
localIoTDBHandler.open(
new LocalIoTDBConfiguration(
- TARGET_DEVICE, new String[] {"local"}, new TSDataType[] {TSDataType.DOUBLE}));
+ TARGET_DEVICE, new String[]{"local"}, new TSDataType[]{TSDataType.DOUBLE}));
mqttHandler.open(
new MQTTConfiguration(
"127.0.0.1",
@@ -794,7 +794,7 @@ public class TriggerExample implements Trigger {
"root",
"root",
new PartialPath(TARGET_DEVICE),
- new String[] {"remote"}));
+ new String[]{"remote"}));
}
private void closeSinkHandlers() throws Exception {
diff --git a/docs/zh/UserGuide/Advanced-Features/Triggers.md b/docs/zh/UserGuide/Advanced-Features/Triggers.md
index 795eb47..b3bd1e9 100644
--- a/docs/zh/UserGuide/Advanced-Features/Triggers.md
+++ b/docs/zh/UserGuide/Advanced-Features/Triggers.md
@@ -714,12 +714,12 @@ package org.apache.iotdb.trigger;
import org.apache.iotdb.db.engine.trigger.api.Trigger;
import org.apache.iotdb.db.engine.trigger.api.TriggerAttributes;
import org.apache.iotdb.db.metadata.PartialPath;
-import org.apache.iotdb.db.sink.mqtt.MQTTConfiguration;
-import org.apache.iotdb.db.sink.mqtt.MQTTEvent;
-import org.apache.iotdb.db.sink.mqtt.MQTTHandler;
-import org.apache.iotdb.db.sink.local.LocalIoTDBConfiguration;
-import org.apache.iotdb.db.sink.local.LocalIoTDBEvent;
-import org.apache.iotdb.db.sink.local.LocalIoTDBHandler;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTEvent;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTHandler;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBEvent;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBHandler;
import org.apache.iotdb.db.utils.windowing.configuration.SlidingSizeWindowConfiguration;
import org.apache.iotdb.db.utils.windowing.handler.SlidingSizeWindowEvaluationHandler;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -801,7 +801,7 @@ public class TriggerExample implements Trigger {
private void openSinkHandlers() throws Exception {
localIoTDBHandler.open(
new LocalIoTDBConfiguration(
- TARGET_DEVICE, new String[] {"local"}, new TSDataType[] {TSDataType.DOUBLE}));
+ TARGET_DEVICE, new String[]{"local"}, new TSDataType[]{TSDataType.DOUBLE}));
mqttHandler.open(
new MQTTConfiguration(
"127.0.0.1",
@@ -809,7 +809,7 @@ public class TriggerExample implements Trigger {
"root",
"root",
new PartialPath(TARGET_DEVICE),
- new String[] {"remote"}));
+ new String[]{"remote"}));
}
private void closeSinkHandlers() throws Exception {
diff --git a/example/trigger/src/main/java/org/apache/iotdb/trigger/AlertingExample.java b/example/trigger/src/main/java/org/apache/iotdb/trigger/AlertingExample.java
index fb1b5b1..500caf2 100644
--- a/example/trigger/src/main/java/org/apache/iotdb/trigger/AlertingExample.java
+++ b/example/trigger/src/main/java/org/apache/iotdb/trigger/AlertingExample.java
@@ -21,9 +21,9 @@ package org.apache.iotdb.trigger;
import org.apache.iotdb.db.engine.trigger.api.Trigger;
import org.apache.iotdb.db.engine.trigger.api.TriggerAttributes;
-import org.apache.iotdb.db.sink.alertmanager.AlertManagerConfiguration;
-import org.apache.iotdb.db.sink.alertmanager.AlertManagerEvent;
-import org.apache.iotdb.db.sink.alertmanager.AlertManagerHandler;
+import org.apache.iotdb.db.engine.trigger.sink.alertmanager.AlertManagerConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.alertmanager.AlertManagerEvent;
+import org.apache.iotdb.db.engine.trigger.sink.alertmanager.AlertManagerHandler;
import java.io.IOException;
import java.util.HashMap;
diff --git a/example/trigger/src/main/java/org/apache/iotdb/trigger/TriggerExample.java b/example/trigger/src/main/java/org/apache/iotdb/trigger/TriggerExample.java
index 55d96aa..0632724 100644
--- a/example/trigger/src/main/java/org/apache/iotdb/trigger/TriggerExample.java
+++ b/example/trigger/src/main/java/org/apache/iotdb/trigger/TriggerExample.java
@@ -21,13 +21,13 @@ package org.apache.iotdb.trigger;
import org.apache.iotdb.db.engine.trigger.api.Trigger;
import org.apache.iotdb.db.engine.trigger.api.TriggerAttributes;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBEvent;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBHandler;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTEvent;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTHandler;
import org.apache.iotdb.db.metadata.PartialPath;
-import org.apache.iotdb.db.sink.local.LocalIoTDBConfiguration;
-import org.apache.iotdb.db.sink.local.LocalIoTDBEvent;
-import org.apache.iotdb.db.sink.local.LocalIoTDBHandler;
-import org.apache.iotdb.db.sink.mqtt.MQTTConfiguration;
-import org.apache.iotdb.db.sink.mqtt.MQTTEvent;
-import org.apache.iotdb.db.sink.mqtt.MQTTHandler;
import org.apache.iotdb.db.utils.windowing.configuration.SlidingSizeWindowConfiguration;
import org.apache.iotdb.db.utils.windowing.handler.SlidingSizeWindowEvaluationHandler;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerConfiguration.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerConfiguration.java
similarity index 89%
rename from server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerConfiguration.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerConfiguration.java
index 3ed4c37..2608285 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerConfiguration.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerConfiguration.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.alertmanager;
+package org.apache.iotdb.db.engine.trigger.sink.alertmanager;
-import org.apache.iotdb.db.sink.api.Configuration;
+import org.apache.iotdb.db.engine.trigger.sink.api.Configuration;
public class AlertManagerConfiguration implements Configuration {
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerEvent.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerEvent.java
similarity index 95%
rename from server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerEvent.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerEvent.java
index d26de46..c23eddf 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerEvent.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerEvent.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.alertmanager;
+package org.apache.iotdb.db.engine.trigger.sink.alertmanager;
-import org.apache.iotdb.db.sink.api.Event;
-import org.apache.iotdb.db.sink.exception.SinkException;
+import org.apache.iotdb.db.engine.trigger.sink.api.Event;
+import org.apache.iotdb.db.engine.trigger.sink.exception.SinkException;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerHandler.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerHandler.java
similarity index 92%
rename from server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerHandler.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerHandler.java
index 4f1378b..ebc6066 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/alertmanager/AlertManagerHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/alertmanager/AlertManagerHandler.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.alertmanager;
+package org.apache.iotdb.db.engine.trigger.sink.alertmanager;
-import org.apache.iotdb.db.sink.api.Handler;
-import org.apache.iotdb.db.sink.exception.SinkException;
+import org.apache.iotdb.db.engine.trigger.sink.api.Handler;
+import org.apache.iotdb.db.engine.trigger.sink.exception.SinkException;
import org.apache.http.HttpStatus;
import org.apache.http.client.methods.CloseableHttpResponse;
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/api/Configuration.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Configuration.java
similarity index 94%
rename from server/src/main/java/org/apache/iotdb/db/sink/api/Configuration.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Configuration.java
index f24994f..b2963ee 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/api/Configuration.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Configuration.java
@@ -17,6 +17,6 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.api;
+package org.apache.iotdb.db.engine.trigger.sink.api;
public interface Configuration {}
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/api/Event.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Event.java
similarity index 94%
rename from server/src/main/java/org/apache/iotdb/db/sink/api/Event.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Event.java
index a4a70e0..3b3b94a 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/api/Event.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Event.java
@@ -17,6 +17,6 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.api;
+package org.apache.iotdb.db.engine.trigger.sink.api;
public interface Event {}
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/api/Handler.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Handler.java
similarity index 95%
rename from server/src/main/java/org/apache/iotdb/db/sink/api/Handler.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Handler.java
index 1827b0c..dbdf620 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/api/Handler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/api/Handler.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.api;
+package org.apache.iotdb.db.engine.trigger.sink.api;
public interface Handler<C extends Configuration, E extends Event> {
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/exception/SinkException.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/exception/SinkException.java
similarity index 94%
rename from server/src/main/java/org/apache/iotdb/db/sink/exception/SinkException.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/exception/SinkException.java
index 66ef627..6f6c2b3 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/exception/SinkException.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/exception/SinkException.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.exception;
+package org.apache.iotdb.db.engine.trigger.sink.exception;
public class SinkException extends Exception {
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBConfiguration.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBConfiguration.java
similarity index 93%
rename from server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBConfiguration.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBConfiguration.java
index 576a47e..c4ebb8b 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBConfiguration.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBConfiguration.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.local;
+package org.apache.iotdb.db.engine.trigger.sink.local;
+import org.apache.iotdb.db.engine.trigger.sink.api.Configuration;
import org.apache.iotdb.db.exception.metadata.IllegalPathException;
import org.apache.iotdb.db.metadata.PartialPath;
-import org.apache.iotdb.db.sink.api.Configuration;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
public class LocalIoTDBConfiguration implements Configuration {
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBEvent.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBEvent.java
similarity index 91%
rename from server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBEvent.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBEvent.java
index 62bfd68..1d10fb9 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBEvent.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBEvent.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.local;
+package org.apache.iotdb.db.engine.trigger.sink.local;
-import org.apache.iotdb.db.sink.api.Event;
+import org.apache.iotdb.db.engine.trigger.sink.api.Event;
public class LocalIoTDBEvent implements Event {
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBHandler.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBHandler.java
similarity index 95%
rename from server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBHandler.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBHandler.java
index 427ab59..9b22dcb 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/local/LocalIoTDBHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/local/LocalIoTDBHandler.java
@@ -17,9 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.local;
+package org.apache.iotdb.db.engine.trigger.sink.local;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.db.engine.trigger.sink.api.Handler;
+import org.apache.iotdb.db.engine.trigger.sink.exception.SinkException;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.MetadataException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
@@ -30,8 +32,6 @@ import org.apache.iotdb.db.qp.executor.PlanExecutor;
import org.apache.iotdb.db.qp.physical.PhysicalPlan;
import org.apache.iotdb.db.qp.physical.crud.InsertRowPlan;
import org.apache.iotdb.db.service.IoTDB;
-import org.apache.iotdb.db.sink.api.Handler;
-import org.apache.iotdb.db.sink.exception.SinkException;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTConfiguration.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTConfiguration.java
similarity index 93%
rename from server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTConfiguration.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTConfiguration.java
index 7e89b81..154007e 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTConfiguration.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTConfiguration.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.mqtt;
+package org.apache.iotdb.db.engine.trigger.sink.mqtt;
+import org.apache.iotdb.db.engine.trigger.sink.api.Configuration;
import org.apache.iotdb.db.metadata.PartialPath;
-import org.apache.iotdb.db.sink.api.Configuration;
public class MQTTConfiguration implements Configuration {
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTEvent.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTEvent.java
similarity index 93%
rename from server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTEvent.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTEvent.java
index 1c876ec..d48b377 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTEvent.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTEvent.java
@@ -17,9 +17,9 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.mqtt;
+package org.apache.iotdb.db.engine.trigger.sink.mqtt;
-import org.apache.iotdb.db.sink.api.Event;
+import org.apache.iotdb.db.engine.trigger.sink.api.Event;
import org.fusesource.mqtt.client.QoS;
diff --git a/server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTHandler.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTHandler.java
similarity index 93%
rename from server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTHandler.java
rename to server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTHandler.java
index 342a3e1..ccd95c1 100644
--- a/server/src/main/java/org/apache/iotdb/db/sink/mqtt/MQTTHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/sink/mqtt/MQTTHandler.java
@@ -17,10 +17,10 @@
* under the License.
*/
-package org.apache.iotdb.db.sink.mqtt;
+package org.apache.iotdb.db.engine.trigger.sink.mqtt;
-import org.apache.iotdb.db.sink.api.Handler;
-import org.apache.iotdb.db.sink.exception.SinkException;
+import org.apache.iotdb.db.engine.trigger.sink.api.Handler;
+import org.apache.iotdb.db.engine.trigger.sink.exception.SinkException;
import org.apache.iotdb.tsfile.utils.Binary;
import org.fusesource.mqtt.client.BlockingConnection;
diff --git a/server/src/test/java/org/apache/iotdb/db/sink/AlertManagerTest.java b/server/src/test/java/org/apache/iotdb/db/sink/AlertManagerTest.java
index e0fa455..2f7e337 100644
--- a/server/src/test/java/org/apache/iotdb/db/sink/AlertManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sink/AlertManagerTest.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.sink;
-import org.apache.iotdb.db.sink.alertmanager.AlertManagerConfiguration;
-import org.apache.iotdb.db.sink.alertmanager.AlertManagerEvent;
-import org.apache.iotdb.db.sink.alertmanager.AlertManagerHandler;
+import org.apache.iotdb.db.engine.trigger.sink.alertmanager.AlertManagerConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.alertmanager.AlertManagerEvent;
+import org.apache.iotdb.db.engine.trigger.sink.alertmanager.AlertManagerHandler;
import com.sun.net.httpserver.HttpServer;
import org.junit.AfterClass;
diff --git a/server/src/test/java/org/apache/iotdb/db/sink/LocalIoTDBSinkTest.java b/server/src/test/java/org/apache/iotdb/db/sink/LocalIoTDBSinkTest.java
index 0261cf7..0239c43 100644
--- a/server/src/test/java/org/apache/iotdb/db/sink/LocalIoTDBSinkTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sink/LocalIoTDBSinkTest.java
@@ -19,10 +19,10 @@
package org.apache.iotdb.db.sink;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBEvent;
+import org.apache.iotdb.db.engine.trigger.sink.local.LocalIoTDBHandler;
import org.apache.iotdb.db.exception.query.QueryProcessException;
-import org.apache.iotdb.db.sink.local.LocalIoTDBConfiguration;
-import org.apache.iotdb.db.sink.local.LocalIoTDBEvent;
-import org.apache.iotdb.db.sink.local.LocalIoTDBHandler;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/server/src/test/java/org/apache/iotdb/db/sink/MQTTSinkTest.java b/server/src/test/java/org/apache/iotdb/db/sink/MQTTSinkTest.java
index 8e7b92e..dd48dd9 100644
--- a/server/src/test/java/org/apache/iotdb/db/sink/MQTTSinkTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sink/MQTTSinkTest.java
@@ -20,10 +20,10 @@
package org.apache.iotdb.db.sink;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTConfiguration;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTEvent;
+import org.apache.iotdb.db.engine.trigger.sink.mqtt.MQTTHandler;
import org.apache.iotdb.db.metadata.PartialPath;
-import org.apache.iotdb.db.sink.mqtt.MQTTConfiguration;
-import org.apache.iotdb.db.sink.mqtt.MQTTEvent;
-import org.apache.iotdb.db.sink.mqtt.MQTTHandler;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.jdbc.Config;