You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by er...@apache.org on 2022/03/21 02:33:32 UTC
[iotdb] 06/07: Sync with master
This is an automated email from the ASF dual-hosted git repository.
ericpai pushed a commit to branch new_mpp
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 4da5757bd1d5a03311a5111ca9b36874f024d10e
Author: ericpai <er...@hotmail.com>
AuthorDate: Thu Mar 17 10:41:32 2022 +0800
Sync with master
---
.../mpp/buffer}/IDataBlockManager.java | 6 +--
.../{ => db}/mpp/memory/LocalMemoryManager.java | 2 +-
.../iotdb/{ => db}/mpp/memory/MemoryPool.java | 2 +-
.../mpp/schedule}/ExecutionContext.java | 4 +-
.../mpp/schedule}/FragmentInstanceManager.java | 14 +++----
.../schedule}/FragmentInstanceTaskCallback.java | 4 +-
.../schedule}/FragmentInstanceTaskExecutor.java | 6 +--
.../schedule}/FragmentInstanceTimeoutSentinel.java | 8 ++--
.../mpp/schedule}/IFragmentInstanceManager.java | 11 +++---
.../execution => db/mpp/schedule}/queue/ID.java | 2 +-
.../mpp/schedule}/queue/IDIndexedAccessible.java | 2 +-
.../mpp/schedule}/queue/IndexedBlockingQueue.java | 2 +-
.../mpp/schedule}/queue/L1PriorityQueue.java | 2 +-
.../mpp/schedule}/queue/L2PriorityQueue.java | 2 +-
.../mpp/schedule}/task/FragmentInstanceID.java | 4 +-
.../mpp/schedule}/task/FragmentInstanceTask.java | 10 ++---
.../schedule}/task/FragmentInstanceTaskStatus.java | 2 +-
.../java/org/apache/iotdb/mpp/common/ITSBlock.java | 45 ----------------------
.../apache/iotdb/mpp/common/TsBlockMetadata.java | 22 -----------
.../iotdb/{ => db}/mpp/memory/MemoryPoolTest.java | 2 +-
.../mpp/schedule}/queue/L1PriorityQueueTest.java | 2 +-
.../mpp/schedule}/queue/L2PriorityQueueTest.java | 2 +-
.../mpp/schedule}/queue/QueueElement.java | 2 +-
23 files changed, 45 insertions(+), 113 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/mpp/shuffle/IDataBlockManager.java b/server/src/main/java/org/apache/iotdb/db/mpp/buffer/IDataBlockManager.java
similarity index 94%
rename from server/src/main/java/org/apache/iotdb/mpp/shuffle/IDataBlockManager.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/buffer/IDataBlockManager.java
index a05d04a..391db95 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/shuffle/IDataBlockManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/buffer/IDataBlockManager.java
@@ -17,11 +17,11 @@
* under the License.
*/
-package org.apache.iotdb.mpp.shuffle;
+package org.apache.iotdb.db.mpp.buffer;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceID;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceTask;
import org.apache.iotdb.mpp.common.ITSBlock;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceID;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceTask;
public interface IDataBlockManager {
diff --git a/server/src/main/java/org/apache/iotdb/mpp/memory/LocalMemoryManager.java b/server/src/main/java/org/apache/iotdb/db/mpp/memory/LocalMemoryManager.java
similarity index 97%
rename from server/src/main/java/org/apache/iotdb/mpp/memory/LocalMemoryManager.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/memory/LocalMemoryManager.java
index cc5305e..797075f 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/memory/LocalMemoryManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/memory/LocalMemoryManager.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.mpp.memory;
+package org.apache.iotdb.db.mpp.memory;
/**
* Manages memory of a data node. The memory is divided into two memory pools so that the memory for
diff --git a/server/src/main/java/org/apache/iotdb/mpp/memory/MemoryPool.java b/server/src/main/java/org/apache/iotdb/db/mpp/memory/MemoryPool.java
similarity index 98%
rename from server/src/main/java/org/apache/iotdb/mpp/memory/MemoryPool.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/memory/MemoryPool.java
index 29b7228..41a687d 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/memory/MemoryPool.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/memory/MemoryPool.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.mpp.memory;
+package org.apache.iotdb.db.mpp.memory;
import org.apache.commons.lang3.Validate;
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/ExecutionContext.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/ExecutionContext.java
similarity index 89%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/ExecutionContext.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/ExecutionContext.java
index 7428b73..adf7874 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/ExecutionContext.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/ExecutionContext.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution;
+package org.apache.iotdb.db.mpp.schedule;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceTask;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceTask;
/** The execution context of a {@link FragmentInstanceTask} */
public class ExecutionContext {}
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceManager.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceManager.java
similarity index 92%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceManager.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceManager.java
index 8917dd4..bf38396 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceManager.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution;
+package org.apache.iotdb.db.mpp.schedule;
import org.apache.iotdb.db.exception.StartupException;
+import org.apache.iotdb.db.mpp.schedule.queue.IndexedBlockingQueue;
+import org.apache.iotdb.db.mpp.schedule.queue.L1PriorityQueue;
+import org.apache.iotdb.db.mpp.schedule.queue.L2PriorityQueue;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceID;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceTask;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceTaskStatus;
import org.apache.iotdb.db.service.IService;
import org.apache.iotdb.db.service.ServiceType;
-import org.apache.iotdb.mpp.execution.queue.IndexedBlockingQueue;
-import org.apache.iotdb.mpp.execution.queue.L1PriorityQueue;
-import org.apache.iotdb.mpp.execution.queue.L2PriorityQueue;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceID;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceTask;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceTaskStatus;
import java.util.List;
import java.util.Map;
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTaskCallback.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTaskCallback.java
similarity index 90%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTaskCallback.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTaskCallback.java
index 6eee1ad..c3ba2e7 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTaskCallback.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTaskCallback.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution;
+package org.apache.iotdb.db.mpp.schedule;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceTask;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceTask;
/** A common interface for {@link FragmentInstanceTask} business logic callback */
@FunctionalInterface
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTaskExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTaskExecutor.java
similarity index 90%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTaskExecutor.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTaskExecutor.java
index b35a6f7..2d3e606 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTaskExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTaskExecutor.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution;
+package org.apache.iotdb.db.mpp.schedule;
-import org.apache.iotdb.mpp.execution.queue.IndexedBlockingQueue;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceTask;
+import org.apache.iotdb.db.mpp.schedule.queue.IndexedBlockingQueue;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceTask;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTimeoutSentinel.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTimeoutSentinel.java
similarity index 91%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTimeoutSentinel.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTimeoutSentinel.java
index 4171f26..75f9eba 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/FragmentInstanceTimeoutSentinel.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/FragmentInstanceTimeoutSentinel.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution;
+package org.apache.iotdb.db.mpp.schedule;
-import org.apache.iotdb.mpp.execution.queue.IndexedBlockingQueue;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceTask;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceTaskStatus;
+import org.apache.iotdb.db.mpp.schedule.queue.IndexedBlockingQueue;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceTask;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceTaskStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/IFragmentInstanceManager.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/IFragmentInstanceManager.java
similarity index 80%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/IFragmentInstanceManager.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/IFragmentInstanceManager.java
index a27db32..98dc0c4 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/IFragmentInstanceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/IFragmentInstanceManager.java
@@ -16,9 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution;
+package org.apache.iotdb.db.mpp.schedule;
-import org.apache.iotdb.mpp.execution.task.FragmentInstanceID;
+import org.apache.iotdb.db.mpp.buffer.IDataBlockManager;
+import org.apache.iotdb.db.mpp.schedule.task.FragmentInstanceID;
/** the interface of fragment instance scheduling */
public interface IFragmentInstanceManager {
@@ -26,8 +27,7 @@ public interface IFragmentInstanceManager {
void submitFragmentInstance();
/**
- * the notifying interface for {@link org.apache.iotdb.mpp.shuffle.IDataBlockManager} when
- * upstream data comes.
+ * the notifying interface for {@link IDataBlockManager} when upstream data comes.
*
* @param instanceID the fragment instance to be notified.
* @param upstreamInstanceId the upstream instance id.
@@ -35,8 +35,7 @@ public interface IFragmentInstanceManager {
void inputBlockAvailable(FragmentInstanceID instanceID, FragmentInstanceID upstreamInstanceId);
/**
- * the notifying interface for {@link org.apache.iotdb.mpp.shuffle.IDataBlockManager} when
- * downstream data has been consumed.
+ * the notifying interface for {@link IDataBlockManager} when downstream data has been consumed.
*
* @param instanceID the fragment instance to be notified.
*/
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/ID.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/ID.java
similarity index 94%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/queue/ID.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/ID.java
index cc7d58f..940370f 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/ID.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/ID.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.queue;
+package org.apache.iotdb.db.mpp.schedule.queue;
/** A simple interface to indicate the id type */
public interface ID {}
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/IDIndexedAccessible.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/IDIndexedAccessible.java
similarity index 95%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/queue/IDIndexedAccessible.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/IDIndexedAccessible.java
index 5ae4c96..86b0c8b 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/IDIndexedAccessible.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/IDIndexedAccessible.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.queue;
+package org.apache.iotdb.db.mpp.schedule.queue;
/** A simple interface for id getter and setter */
public interface IDIndexedAccessible {
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/IndexedBlockingQueue.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/IndexedBlockingQueue.java
similarity index 99%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/queue/IndexedBlockingQueue.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/IndexedBlockingQueue.java
index 6ddc610..bb6751f 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/IndexedBlockingQueue.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/IndexedBlockingQueue.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.queue;
+package org.apache.iotdb.db.mpp.schedule.queue;
/**
* The base class of a special kind of blocking queue, which has these characters:
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/L1PriorityQueue.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/L1PriorityQueue.java
similarity index 98%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/queue/L1PriorityQueue.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/L1PriorityQueue.java
index a9cad83..6aedb89 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/L1PriorityQueue.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/L1PriorityQueue.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.queue;
+package org.apache.iotdb.db.mpp.schedule.queue;
import java.util.Comparator;
import java.util.SortedMap;
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/L2PriorityQueue.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/L2PriorityQueue.java
similarity index 98%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/queue/L2PriorityQueue.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/L2PriorityQueue.java
index c23e74a..cd3caf3 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/queue/L2PriorityQueue.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/queue/L2PriorityQueue.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.queue;
+package org.apache.iotdb.db.mpp.schedule.queue;
import java.util.Comparator;
import java.util.SortedMap;
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceID.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceID.java
similarity index 95%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceID.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceID.java
index f52b5c3..dab6e0a 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceID.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceID.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.task;
+package org.apache.iotdb.db.mpp.schedule.task;
-import org.apache.iotdb.mpp.execution.queue.ID;
+import org.apache.iotdb.db.mpp.schedule.queue.ID;
import org.jetbrains.annotations.NotNull;
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTask.java
similarity index 93%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceTask.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTask.java
index 1836c74..3c26f33 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTask.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.task;
+package org.apache.iotdb.db.mpp.schedule.task;
-import org.apache.iotdb.mpp.execution.ExecutionContext;
-import org.apache.iotdb.mpp.execution.FragmentInstanceTaskExecutor;
-import org.apache.iotdb.mpp.execution.queue.ID;
-import org.apache.iotdb.mpp.execution.queue.IDIndexedAccessible;
+import org.apache.iotdb.db.mpp.schedule.ExecutionContext;
+import org.apache.iotdb.db.mpp.schedule.FragmentInstanceTaskExecutor;
+import org.apache.iotdb.db.mpp.schedule.queue.ID;
+import org.apache.iotdb.db.mpp.schedule.queue.IDIndexedAccessible;
import java.util.Comparator;
import java.util.concurrent.locks.Lock;
diff --git a/server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceTaskStatus.java b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTaskStatus.java
similarity index 96%
rename from server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceTaskStatus.java
rename to server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTaskStatus.java
index 5ee9fb3..f50dc4d 100644
--- a/server/src/main/java/org/apache/iotdb/mpp/execution/task/FragmentInstanceTaskStatus.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/schedule/task/FragmentInstanceTaskStatus.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.task;
+package org.apache.iotdb.db.mpp.schedule.task;
/** the status enum of {@link FragmentInstanceTask} */
public enum FragmentInstanceTaskStatus {
diff --git a/server/src/main/java/org/apache/iotdb/mpp/common/ITSBlock.java b/server/src/main/java/org/apache/iotdb/mpp/common/ITSBlock.java
deleted file mode 100644
index 449e0fc..0000000
--- a/server/src/main/java/org/apache/iotdb/mpp/common/ITSBlock.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.mpp.common;
-
-import org.apache.iotdb.tsfile.read.common.RowRecord;
-
-/**
- * Intermediate result for most of ExecOperators. The TsBlock contains data from one or more columns
- * and constructs them as a row based view The columns can be series, aggregation result for one
- * series or scalar value (such as deviceName). The TsBlock also contains the metadata to describe
- * the columns.
- */
-public class ITSBlock {
-
- private TsBlockMetadata metadata;
-
- public boolean hasNext() {
- return false;
- }
-
- public RowRecord getNext() {
- return null;
- }
-
- public TsBlockMetadata getMetadata() {
- return metadata;
- }
-}
diff --git a/server/src/main/java/org/apache/iotdb/mpp/common/TsBlockMetadata.java b/server/src/main/java/org/apache/iotdb/mpp/common/TsBlockMetadata.java
deleted file mode 100644
index ed7680f..0000000
--- a/server/src/main/java/org/apache/iotdb/mpp/common/TsBlockMetadata.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.iotdb.mpp.common;
-
-public class TsBlockMetadata {}
diff --git a/server/src/test/java/org/apache/iotdb/mpp/memory/MemoryPoolTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/memory/MemoryPoolTest.java
similarity index 99%
rename from server/src/test/java/org/apache/iotdb/mpp/memory/MemoryPoolTest.java
rename to server/src/test/java/org/apache/iotdb/db/mpp/memory/MemoryPoolTest.java
index cb76b93..8f21c7d 100644
--- a/server/src/test/java/org/apache/iotdb/mpp/memory/MemoryPoolTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/memory/MemoryPoolTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.iotdb.mpp.memory;
+package org.apache.iotdb.db.mpp.memory;
import org.junit.Assert;
import org.junit.Before;
diff --git a/server/src/test/java/org/apache/iotdb/mpp/execution/queue/L1PriorityQueueTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/L1PriorityQueueTest.java
similarity index 98%
rename from server/src/test/java/org/apache/iotdb/mpp/execution/queue/L1PriorityQueueTest.java
rename to server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/L1PriorityQueueTest.java
index 3809d4a..fba87fd 100644
--- a/server/src/test/java/org/apache/iotdb/mpp/execution/queue/L1PriorityQueueTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/L1PriorityQueueTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.queue;
+package org.apache.iotdb.db.mpp.schedule.queue;
import org.junit.Assert;
import org.junit.Test;
diff --git a/server/src/test/java/org/apache/iotdb/mpp/execution/queue/L2PriorityQueueTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/L2PriorityQueueTest.java
similarity index 98%
rename from server/src/test/java/org/apache/iotdb/mpp/execution/queue/L2PriorityQueueTest.java
rename to server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/L2PriorityQueueTest.java
index 5d34bb7..9f161e1 100644
--- a/server/src/test/java/org/apache/iotdb/mpp/execution/queue/L2PriorityQueueTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/L2PriorityQueueTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.queue;
+package org.apache.iotdb.db.mpp.schedule.queue;
import org.junit.Assert;
import org.junit.Test;
diff --git a/server/src/test/java/org/apache/iotdb/mpp/execution/queue/QueueElement.java b/server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/QueueElement.java
similarity index 97%
rename from server/src/test/java/org/apache/iotdb/mpp/execution/queue/QueueElement.java
rename to server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/QueueElement.java
index 4aed3a5..844c91d 100644
--- a/server/src/test/java/org/apache/iotdb/mpp/execution/queue/QueueElement.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/schedule/queue/QueueElement.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.iotdb.mpp.execution.queue;
+package org.apache.iotdb.db.mpp.schedule.queue;
public class QueueElement implements IDIndexedAccessible {
private QueueElementID id;