You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/11/08 08:06:45 UTC
[iotdb] branch master updated: Add class which are inspired by Trino into LICENSE (#7926)
This is an automated email from the ASF dual-hosted git repository.
haonan 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 91d475c9b8 Add class which are inspired by Trino into LICENSE (#7926)
91d475c9b8 is described below
commit 91d475c9b8b44ee61c976ef53bc55130ebe082ed
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Tue Nov 8 16:06:40 2022 +0800
Add class which are inspired by Trino into LICENSE (#7926)
---
LICENSE | 15 ++++++++++++++-
.../org/apache/iotdb/db/mpp/execution/StateMachine.java | 3 ---
.../apache/iotdb/tsfile/read/common/block/TsBlock.java | 5 ++---
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/LICENSE b/LICENSE
index cb041153de..8aef993efa 100644
--- a/LICENSE
+++ b/LICENSE
@@ -273,4 +273,17 @@ The following files include code modified from Micrometer project.
Copyright: 2017 VMware
Project page: https://github.com/micrometer-metrics/micrometer
-License: https://github.com/micrometer-metrics/micrometer/blob/main/LICENSE
\ No newline at end of file
+License: https://github.com/micrometer-metrics/micrometer/blob/main/LICENSE
+
+--------------------------------------------------------------------------------
+
+The following files include code modified from Trino project(https://github.com/trinodb/trino),
+which is under Apache License 2.0:
+
+./server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryState.java
+./server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java
+./server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java
+./server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceState.java
+./server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceStateMachine.java
+./server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
+./tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/*
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java
index c1b7e76360..cd85613b55 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java
@@ -34,9 +34,6 @@ import static com.google.common.base.Preconditions.checkState;
import static com.google.common.util.concurrent.Futures.immediateFuture;
import static java.util.Objects.requireNonNull;
-/**
- * Simple state machine which holds a single state. Callers can register for state change events.
- */
@ThreadSafe
public class StateMachine<T> {
private final String name;
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java
index 20d408abc6..70dad931fb 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/TsBlock.java
@@ -35,10 +35,9 @@ import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
/**
- * Intermediate result for most of ExecOperators. The Tablet contains data from one or more columns
+ * 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 Tablet also contains the metadata to describe
- * the columns.
+ * series or scalar value (such as deviceName).
*/
public class TsBlock {