Merge branch 'master' into codex/upgrade-thrift-0.25

Author: HTHou

LICENSE-binary

@@ -232,7 +232,7 @@ io.swagger.core.v3:swagger-integration-jakarta:2.2.50
 io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.50
 io.swagger.core.v3:swagger-models-jakarta:2.2.50
 jakarta.inject:jakarta.inject-api:2.0.1
-at.yawk.lz4:lz4-java:1.11.1
+at.yawk.lz4:lz4-java:1.11.4
 com.github.ben-manes.caffeine:caffeine:2.9.3
 org.eclipse.jetty:jetty-http:12.0.36
 org.eclipse.jetty:jetty-io:12.0.36

docker/ReadMe.md

@@ -70,7 +70,7 @@ apache-iotdb-2.0.11-SNAPSHOT-all-bin.zip
 apache-iotdb-2.0.11-SNAPSHOT-ainode-bin.zip
 ```
 
-To avoid mannually copy these files, you can run our `do-docker-build.sh` with argument `-b`.
+To avoid manually copy these files, you can run our `do-docker-build.sh` with argument `-b`.
 
 # How to run IoTDB server 
 
@@ -85,7 +85,7 @@ docker run -d --name iotdb -p 6667:6667 -p 31999:31999 -p 8181:8181 -p 5555:5555
 ```shell
 docker run -d --name iotdb -p 6667:6667 -p 31999:31999 -p 8181:8181 -p 5555:5555 -p 9003:9003 -p 40010:40010 apache/iotdb:<version>
 ```
-Since 1.0.0, see [offical documents.](https://iotdb.apache.org/UserGuide/latest/QuickStart/QuickStart.html)
+Since 1.0.0, see [official documents.](https://iotdb.apache.org/UserGuide/latest/QuickStart/QuickStart.html)
 
 # How to register AINode to IoTDB cluster
 

docker/src/main/Dockerfile-1.0.0-confignode

@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:17-jre-jammy
 ARG version=1.0.0
 ARG target=apache-iotdb-${version}-all-bin
 

docker/src/main/Dockerfile-1.0.0-datanode

@@ -16,7 +16,7 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:17-jre-jammy
 ARG version=1.0.0
 ARG target=apache-iotdb-${version}-all-bin
 

docker/src/main/Dockerfile-1.0.0-standalone

@@ -18,7 +18,7 @@
 #
 # syntax=docker/dockerfile:1
 
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:17-jre-jammy
 ARG version=1.0.0
 ARG target=apache-iotdb-${version}-all-bin
 

docker/src/main/Dockerfile-1c1d

@@ -19,7 +19,7 @@
 
 # docker build context is the root path of the repository
 
-FROM eclipse-temurin:17-jre-focal
+FROM eclipse-temurin:17-jre-jammy
 
 ADD distribution/target/apache-iotdb-*-all-bin.zip /
 ADD docker/src/main/DockerCompose/start-1c1d.sh /

iotdb-client/client-py/README.md

@@ -47,7 +47,7 @@ You have to install thrift (>=0.14.1) before using the package.
 
 First, download the latest package: `pip3 install apache-iotdb`
 
-You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionExample.py)
+You can get an example of using the package to read and write data at here: [Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/session_example.py)
 
 An example of aligned timeseries: [Aligned Timeseries Session Example](https://github.com/apache/iotdb/blob/master/iotdb-client/client-py/SessionAlignedTimeseriesExample.py)
 
@@ -576,7 +576,7 @@ This folder is ignored from git and should **never be pushed to git!**
 
 ### Session Client & Example
 
-We packed up the Thrift interface in `client-py/src/iotdb/Session.py` (similar with its Java counterpart), also provided an example file `client-py/src/SessionExample.py` of how to use the session module. please read it carefully.
+We packed up the Thrift interface in `client-py/iotdb/Session.py` (similar with its Java counterpart), also provided an example file `client-py/session_example.py` of how to use the session module. please read it carefully.
 
 
 Or, another simple example:
@@ -606,7 +606,7 @@ To run all defined tests just type `pytest .` in the root folder.
 
 
 
-### Futher Tools
+### Further Tools
 
 [black](https://pypi.org/project/black/) and [flake8](https://pypi.org/project/flake8/) are installed for autoformatting and linting.
 Both can be run by `black .` or `flake8 .` respectively.

iotdb-client/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java

@@ -371,6 +371,28 @@ public enum TSStatusCode {
   EXTERNAL_SERVICE_INSTANCE_CREATE_ERROR(2303),
   CANNOT_DROP_BUILTIN_EXTERNAL_SERVICE(2304),
   CANNOT_DROP_RUNNING_EXTERNAL_SERVICE(2305),
+
+  // LBAC
+  LBAC_ACCESS_DENIED(2400),
+  COMPONENT_NOT_EXISTS(2401),
+  COMPONENT_ALREADY_EXISTS(2402),
+  POLICY_NOT_EXISTS(2403),
+  POLICY_ALREADY_EXISTS(2404),
+  LABEL_NOT_EXISTS(2405),
+  LABEL_ALREADY_EXISTS(2406),
+  ELEMENT_NOT_EXISTS(2407),
+  ELEMENT_ALREADY_EXISTS(2408),
+  INVALID_COMPONENT_TYPE(2409),
+  INVALID_ELEMENT_CLAUSE(2410),
+  INVALID_COMMENT_TARGET(2411),
+  COMPONENT_IS_REFERENCED(2412),
+  POLICY_IS_REFERENCED(2413),
+  LABEL_IS_REFERENCED(2414),
+  POLICY_NOT_SET(2415),
+  POLICY_ALREADY_SET(2416),
+  POLICY_CONFLICT(2417),
+  LABEL_NOT_SET(2418),
+  INVALID_LABEL_VALUE(2419),
   ;
 
   private final int statusCode;

iotdb-core/confignode/src/main/i18n/en/org/apache/iotdb/confignode/i18n/ManagerMessages.java

@@ -611,6 +611,7 @@ private ManagerMessages() {}
   public static final String LOG_GOT_IOEXCEPTION_DESERIALIZE_USE_ROLE_FILE_TYPE_ARG_1B548759 = "Got IOException when deserialize use&role file, type:{}";
   public static final String LOG_GOT_IOEXCEPTION_DESERIALIZE_ROLELIST_1354F29E = "Got IOException when deserialize roleList";
   public static final String LOG_GOT_EXCEPTION_DESERIALIZING_TTL_FILE_F806EB40 = "Got exception when deserializing ttl file";
+  public static final String LOG_UNSUPPORTED_USER_ROLE_PROFILE_VERSION_ARG_THIS_NODE_SUPPORTS_UP_TO_ARG_2ABBF4FA = "Unsupported user/role profile version %d, this node supports up to %d";
   public static final String LOG_UNRECOGNIZED_NODE_TYPE_CANNOT_DESERIALIZE_MTREE_GIVEN_BUFFER_5CF3121B = "Unrecognized node type. Cannot deserialize MTree from given buffer";
   public static final String LOG_GOT_IOEXCEPTION_CONSTRUCT_DATABASE_TREE_49436621 = "Got IOException when construct database Tree";
   public static final String LOG_GOT_IOEXCEPTION_DESERIALIZE_TEMPLATE_INFO_49EE617E = "Got IOException when deserialize template info";

iotdb-core/confignode/src/main/i18n/en/org/apache/iotdb/confignode/i18n/ProcedureMessages.java

@@ -1200,6 +1200,8 @@ private ProcedureMessages() {}
   public static final String LOG_FINISHED_SUBPROCEDURE_PID_ARG_RESUME_PROCESSING_PPID_ARG_93ED990B = "Finished subprocedure pid={}, resume processing ppid={}";
   public static final String LOG_HALT_PID_ARG_ACTIVECOUNT_ARG_411F3EBF = "Halt pid={}, activeCount={}";
   public static final String LOG_EXCEPTION_HAPPENED_WORKER_ARG_EXECUTE_PROCEDURE_ARG_6E3AD27D = "Exception happened when worker {} execute procedure {}";
+  public static final String LOG_FAILED_TO_COMMIT_RELEASE_ARG_FOR_TABLE_ARG_ARG_TO_DATANODE_FAILURE_RESULTS_ARG_55386572 =
+      "Failed to commit-release {} for table {}.{} to DataNode, failure results: {}";
   public static final String LOG_WORKER_STUCK_ARG_ARG_RUN_TIME_ARG_MS_FB612354 = "Worker stuck {}({}), run time {} ms";
   public static final String LOG_PROCEDURE_WORKERS_ARG_RUNNING_ARG_RUNNING_STUCK_1565936D = "Procedure workers: {} is running, {} is running and stuck";
   public static final String LOG_ADD_PROCEDURE_ARG_AS_ARG_TH_ROLLBACK_STEP_C71B2184 = "Add procedure {} as the {}th rollback step";