Skip to content

Commit

Permalink
repo-sync-2025-02-18T20:16:02+0800 (#19)
Browse files Browse the repository at this point in the history 
* repo-sync-2025-02-18T20:16:02+0800

* restore: git restore --source=HEAD~1

* restore: cherry-pick sdk modify
  • Loading branch information
@YanZhuangz
YanZhuangz authored Feb 19, 2025
1 parent d30da95 commit 2054c63
Show file tree
Hide file tree
Showing 72 changed files with 809 additions and 1,980 deletions.
1 change: 1 addition & 0 deletions .licenserc.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ header: # <1>
- 'pyproject.toml'
- 'setup.cfg'
- 'dataproxy-manager/src/main/java/org/secretflow/dataproxy/manager/connector/rdbms/adaptor'
- '**/src/main/resources/META-INF/services/**'

comment: never # <9>

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfiles/dataproxy.Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/secretpad-base-lite:0.3
FROM secretflow-registry.cn-hangzhou.cr.aliyuncs.com/secretflow/java-base:17.0.13-jre-anolis23

ENV LANG=C.UTF-8
WORKDIR /app
Expand Down
54 changes: 47 additions & 7 deletions dataproxy-api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,65 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf-lite</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-common-protos</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>findbugs</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>compile</scope>
<optional>true</optional>
</dependency>
</dependencies>

Expand Down
156 changes: 93 additions & 63 deletions dataproxy-common/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,86 +13,116 @@
<artifactId>dataproxy-common</artifactId>

<dependencies>
<dependency>
<groupId>org.secretflow</groupId>
<artifactId>dataproxy-api</artifactId>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>compile</scope>
</dependency>
<!--<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>-->
<!--<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>-->
<!--<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>-->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<!--<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</dependency>-->

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
</dependency>

<!-- apache arrow start-->
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-vector</artifactId>
</dependency>

<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-dataset</artifactId>
</dependency>

<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-format</artifactId>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>

<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>flight-core</artifactId>
</dependency>
<!--<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>flight-grpc</artifactId>
</dependency>-->
<exclusions>
<exclusion>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-format</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-netty</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</exclusion>

<!-- apache arrow end-->
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf-lite</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java-util</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.flatbuffers</groupId>
<artifactId>flatbuffers-java</artifactId>
</exclusion>
</exclusions>
<optional>true</optional>
</dependency>

<!--<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</dependency>-->
</dependencies>

</project>
2 changes: 2 additions & 0 deletions ...y-common/src/main/java/org/secretflow/dataproxy/common/exceptions/DataproxyErrorCode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ public enum DataproxyErrorCode {
ODPS_PARTITION_NOT_EXISTS(ErrorLevels.ERROR, ErrorTypes.BIZ, "606", "odps partition not exists"),
ODPS_TABLE_NOT_EMPTY(ErrorLevels.ERROR, ErrorTypes.BIZ, "607", "odps table not empty"),
ODPS_TABLE_NOT_SUPPORT_PARTITION(ErrorLevels.ERROR, ErrorTypes.BIZ, "608", "odps table not support partition"),
ODPS_TASK_NOT_READY(ErrorLevels.ERROR, ErrorTypes.BIZ, "609", "odps task not ready"),
ODPS_TASK_NOT_RUN(ErrorLevels.ERROR, ErrorTypes.BIZ, "610", "odps task not run"),


//============================= 第三方错误【900-999】==================================
Expand Down
12 changes: 8 additions & 4 deletions ...y-common/src/main/java/org/secretflow/dataproxy/common/exceptions/DataproxyException.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,24 @@

package org.secretflow.dataproxy.common.exceptions;

import lombok.Getter;
import lombok.extern.slf4j.Slf4j;

import java.io.Serial;

/**
* dataproxy exception
*
* @author muhong
* @date 2023-09-14 14:23
*/
@Getter
@Slf4j
public class DataproxyException extends RuntimeException {

@Serial
private static final long serialVersionUID = -9012364334166955517L;

private final DataproxyErrorCode errorCode;

public DataproxyException(DataproxyErrorCode errorCode) {
Expand Down Expand Up @@ -64,10 +72,6 @@ public static DataproxyException of(DataproxyErrorCode errorCode, String message
return new DataproxyException(errorCode, message, cause);
}

public DataproxyErrorCode getErrorCode() {
return errorCode;
}

public String getDescription() {
return String.format("code: %s, message: %s", getErrorCode().getErrorCode(), getMessage());
}
Expand Down
45 changes: 0 additions & 45 deletions ...common/src/main/java/org/secretflow/dataproxy/common/model/FlightContentFormatConfig.java
View file

This file was deleted.

32 changes: 0 additions & 32 deletions ...mmon/src/main/java/org/secretflow/dataproxy/common/model/FlightContentFormatTypeEnum.java
View file

This file was deleted.

Loading

0 comments on commit 2054c63

Please sign in to comment.