Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/compile-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ on:
push:
branches:
- master
- 'rel/*'
- 'rc/*'
- "rel/*"
- "rc/*"
paths-ignore:
- 'docs/**'
- 'site/**'
- "docs/**"
- "site/**"
pull_request:
branches:
- master
- 'rel/*'
- 'rc/*'
- 'force_ci/**'
- "rel/*"
- "rc/*"
- "force_ci/**"
paths-ignore:
- 'docs/**'
- 'site/**'
- "docs/**"
- "site/**"
# allow manually run the action:
workflow_dispatch:

Expand All @@ -37,8 +37,8 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [8]
os: [ ubuntu-latest ]
java: [17]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
Expand Down
67 changes: 47 additions & 20 deletions .github/workflows/multi-language-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,31 @@ on:
- master
- "rc/*"
paths:
- 'pom.xml'
- 'iotdb-client/pom.xml'
- 'iotdb-client/client-py/**'
- 'iotdb-client/client-cpp/**'
- 'example/client-cpp-example/**'
- 'iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift'
- 'iotdb-protocol/thrift-commons/src/main/thrift/common.thrift'
- '.github/workflows/multi-language-client.yml'
- "pom.xml"
- "iotdb-client/pom.xml"
- "iotdb-client/client-py/**"
- "iotdb-client/client-cpp/**"
- "example/client-cpp-example/**"
- "iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift"
- "iotdb-protocol/thrift-commons/src/main/thrift/common.thrift"
- ".github/workflows/multi-language-client.yml"
pull_request:
branches:
- master
- "rc/*"
- 'force_ci/**'
- "force_ci/**"
paths:
- 'pom.xml'
- 'iotdb-client/pom.xml'
- 'iotdb-client/client-py/**'
- 'iotdb-client/client-cpp/**'
- 'example/client-cpp-example/**'
- 'iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift'
- 'iotdb-protocol/thrift-commons/src/main/thrift/common.thrift'
- '.github/workflows/multi-language-client.yml'
- "pom.xml"
- "iotdb-client/pom.xml"
- "iotdb-client/client-py/**"
- "iotdb-client/client-cpp/**"
- "example/client-cpp-example/**"
- "iotdb-protocol/thrift-datanode/src/main/thrift/client.thrift"
- "iotdb-protocol/thrift-commons/src/main/thrift/common.thrift"
- ".github/workflows/multi-language-client.yml"
# allow manually run the action:
workflow_dispatch:


concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -45,7 +44,16 @@ jobs:
fail-fast: false
max-parallel: 15
matrix:
os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04, windows-2019, windows-2022, macos-latest]
java: [17]
os:
[
ubuntu-20.04,
ubuntu-22.04,
ubuntu-24.04,
windows-2019,
windows-2022,
macos-latest,
]
runs-on: ${{ matrix.os}}

steps:
Expand Down Expand Up @@ -78,6 +86,11 @@ jobs:
}
$boost_path = (Get-ChildItem -Path 'C:\local\' -Filter 'boost_*').FullName
echo $boost_path >> $env:GITHUB_PATH
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
distribution: liberica
java-version: ${{ matrix.java }}
- name: Cache Maven packages
uses: actions/cache@v4
with:
Expand Down Expand Up @@ -109,13 +122,21 @@ jobs:
retention-days: 1

go:
strategy:
matrix:
java: [17]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
token: ${{secrets.GITHUB_TOKEN}}
submodules: recursive
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
distribution: liberica
java-version: ${{ matrix.java }}
- name: Cache Maven packages
uses: actions/cache@v4
with:
Expand All @@ -137,14 +158,20 @@ jobs:
fail-fast: false
max-parallel: 15
matrix:
python: [ '3.6', '3.x' ]
python: ["3.6", "3.x"]
java: [17]
runs-on: ${{ (matrix.python == '3.6' && 'ubuntu-20.04') || 'ubuntu-latest' }}

steps:
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
distribution: liberica
java-version: ${{ matrix.java }}
- name: Cache Maven packages
uses: actions/cache@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions integration-test/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.apache.iotdb.it.env.cluster.config;

import javax.annotation.Nullable;
import javax.validation.constraints.NotNull;
import jakarta.annotation.Nullable;
import jakarta.validation.constraints.NotNull;

import java.io.FileWriter;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.apache.iotdb.itbase.env.JVMConfig;

import javax.annotation.Nullable;
import jakarta.annotation.Nullable;

public class MppJVMConfig implements JVMConfig {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
import org.apache.iotdb.it.framework.IoTDBTestLogger;
import org.apache.iotdb.itbase.env.BaseNodeWrapper;

import jakarta.annotation.Nullable;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.file.PathUtils;
import org.apache.commons.lang3.SystemUtils;
import org.slf4j.Logger;

import javax.annotation.Nullable;
import javax.management.MBeanServerConnection;
import javax.management.remote.JMXConnector;
import javax.management.remote.JMXConnectorFactory;
Expand Down
2 changes: 1 addition & 1 deletion iotdb-core/ainode/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "apache-iotdb-ainode"
version = "2.0.0.dev"
version = "2.0.2.dev"
description = "Apache IoTDB AINode"
readme = "README.md"
authors = ["Apache Software Foundation <dev@iotdb.apache.org>"]
Expand Down
4 changes: 4 additions & 0 deletions iotdb-core/confignode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,10 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;
import org.apache.iotdb.confignode.consensus.request.write.table.AbstractTablePlan;

import jakarta.annotation.Nonnull;
import org.apache.tsfile.utils.ReadWriteIOUtils;

import javax.annotation.Nonnull;

import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;

import jakarta.annotation.Nonnull;
import org.apache.tsfile.utils.ReadWriteIOUtils;

import javax.annotation.Nonnull;

import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlan;
import org.apache.iotdb.confignode.consensus.request.ConfigPhysicalPlanType;

import jakarta.annotation.Nonnull;
import org.apache.tsfile.utils.ReadWriteIOUtils;

import javax.annotation.Nonnull;

import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.iotdb.confignode.rpc.thrift.TShowCQResp;
import org.apache.iotdb.consensus.common.DataSet;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

import java.util.Comparator;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,14 @@
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.rpc.TSStatusCode;

import jakarta.annotation.Nonnull;
import org.apache.ratis.util.AutoCloseableLock;
import org.apache.tsfile.utils.Binary;
import org.apache.tsfile.utils.Pair;
import org.apache.tsfile.utils.ReadWriteIOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nonnull;

import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.iotdb.confignode.manager.schema;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

import java.util.Map;
import java.util.Set;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,13 @@
import org.apache.iotdb.confignode.persistence.schema.mnode.impl.ConfigTableNode;
import org.apache.iotdb.db.schemaengine.template.Template;

import jakarta.annotation.Nonnull;
import org.apache.commons.io.IOUtils;
import org.apache.tsfile.utils.Pair;
import org.apache.tsfile.utils.ReadWriteIOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nonnull;

import java.io.BufferedInputStream;
import java.io.DataInputStream;
import java.io.IOException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import org.apache.iotdb.commons.schema.node.utils.IMNodeContainer;
import org.apache.iotdb.confignode.persistence.schema.mnode.IConfigMNode;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

import java.util.AbstractMap;
import java.util.Collection;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,11 @@
import org.apache.iotdb.pipe.api.exception.PipeException;
import org.apache.iotdb.rpc.TSStatusCode;

import jakarta.annotation.Nonnull;
import org.apache.tsfile.utils.ReadWriteIOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nonnull;

import java.io.DataOutputStream;
import java.io.IOException;
import java.nio.ByteBuffer;
Expand Down
8 changes: 6 additions & 2 deletions iotdb-core/datanode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,10 @@
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
Expand Down Expand Up @@ -284,8 +288,8 @@
<artifactId>netty-buffer</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<groupId>org.eclipse.jetty.ee10</groupId>
<artifactId>jetty-ee10-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.inject</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,13 @@
import org.apache.iotdb.db.queryengine.plan.statement.crud.InsertRowStatement;
import org.apache.iotdb.rpc.IoTDBConnectionException;

import jakarta.validation.constraints.NotNull;
import org.apache.tsfile.common.conf.TSFileConfig;
import org.apache.tsfile.enums.TSDataType;
import org.apache.tsfile.utils.Binary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.validation.constraints.NotNull;

import java.time.ZoneId;
import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.iotdb.commons.utils.PathUtils;
import org.apache.iotdb.db.pipe.event.common.tsfile.PipeTsFileInsertionEvent;

import javax.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull;

/**
* The data model used to record the Event and the data model of the DataRegion corresponding to the
Expand Down
Loading
Loading