Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

repo-sync-2024-12-18T16:45:42+0800 #13

Merged
merged 3 commits into from
Dec 20, 2024
+6,492 −11,621
Merged

repo-sync-2024-12-18T16:45:42+0800 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fda18d
repo-sync-2024-12-18T16:45:42+0800
YanZhuangz Dec 18, 2024
36338cc
Update repositories.bzl
YanZhuangz Dec 18, 2024
1ab66e3
Update Kuscia version
YanZhuangz Dec 20, 2024
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
11 changes: 6 additions & 5 deletions build/Dockerfiles/dataproxy.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@ WORKDIR /app
# fix: RunP proot + java bug
RUN ln -s ${JAVA_HOME}/lib/libjli.so /lib64

COPY target/*.jar dataproxy.jar
COPY config/application.yaml application.yaml
COPY scripts/start_dp.sh start_dp.sh
ENV JAVA_OPTS="" SPRING_PROFILES_ACTIVE="default"
COPY dataproxy-server/target/dataproxy-server-0.0.1-SNAPSHOT.jar dataproxy.jar
COPY libs/*.jar libs/

ENV JAVA_OPTS=""
ENV LOG_LEVEL=INFO
EXPOSE 8023
ENTRYPOINT ${JAVA_HOME}/bin/java ${JAVA_OPTS} -Dsun.net.http.allowRestrictedHeaders=true --add-opens=java.base/java.nio=ALL-UNNAMED -jar -Dspring.profiles.active=${SPRING_PROFILES_ACTIVE} ./dataproxy.jar
ENTRYPOINT ${JAVA_HOME}/bin/java ${JAVA_OPTS} -Dsun.net.http.allowRestrictedHeaders=true --add-opens=java.base/java.nio=ALL-UNNAMED -jar ./dataproxy.jar
40 changes: 0 additions & 40 deletions config/application.yaml
View file
Open in desktop

This file was deleted.

10 changes: 7 additions & 3 deletions dataproxy-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<groupId>org.secretflow</groupId>
<artifactId>dataproxy</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dataproxy-api</artifactId>
Expand All @@ -21,16 +22,19 @@
<artifactId>protobuf-java-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>flight-grpc</artifactId>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId>
<artifactId>grpc-stub</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>

Expand Down
27 changes: 17 additions & 10 deletions dataproxy-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<groupId>org.secretflow</groupId>
<artifactId>dataproxy</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>dataproxy-common</artifactId>
Expand All @@ -20,23 +21,24 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<!--<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<dependency>
</dependency>-->
<!--<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
</dependency>
<dependency>
</dependency>-->
<!--<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
</dependency>-->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
Expand All @@ -45,10 +47,10 @@
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<dependency>
<!--<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</dependency>
</dependency>-->

<dependency>
<groupId>com.google.protobuf</groupId>
Expand Down Expand Up @@ -80,12 +82,17 @@
<groupId>org.apache.arrow</groupId>
<artifactId>flight-core</artifactId>
</dependency>
<dependency>
<!--<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>flight-grpc</artifactId>
</dependency>
</dependency>-->

<!-- apache arrow end-->

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

</project>
66 changes: 0 additions & 66 deletions ...n/src/main/java/org/secretflow/dataproxy/common/model/dataset/format/CSVFormatConfig.java
View file
Open in desktop

This file was deleted.

73 changes: 0 additions & 73 deletions ...src/main/java/org/secretflow/dataproxy/common/model/dataset/format/PartitionBehavior.java
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions ...src/main/java/org/secretflow/dataproxy/common/model/dataset/format/TableFormatConfig.java
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions .../src/main/java/org/secretflow/dataproxy/common/model/datasource/DatasourceConnConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
import lombok.Data;
import lombok.NoArgsConstructor;
import org.secretflow.dataproxy.common.model.datasource.conn.ConnConfig;
import org.secretflow.dataproxy.common.utils.IdUtils;
import org.secretflow.dataproxy.common.utils.JsonUtils;

/**
* Datasource connection config
Expand All @@ -46,7 +44,4 @@ public class DatasourceConnConfig {
*/
private ConnConfig connConfig;

public String generateUniqueId() {
return IdUtils.combineIds(JsonUtils.toJSONString(this));
}
}
Loading
Loading