Skip to content

Commit 334742e

Browse files
committed
[opt](build) use mvn to compile thrift for fe
1 parent b8cd32a commit 334742e

4 files changed

Lines changed: 21 additions & 13 deletions

File tree

fe/fe-thrift/pom.xml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ under the License.
4040
</dependencies>
4141

4242
<build>
43-
<finalName>doris-fe-catalog</finalName>
43+
<finalName>doris-fe-thrift</finalName>
4444
<directory>${project.basedir}/target/</directory>
4545
<plugins>
4646
<!-- Build source jar -->
@@ -59,6 +59,25 @@ under the License.
5959
</execution>
6060
</executions>
6161
</plugin>
62+
<plugin>
63+
<groupId>org.apache.thrift</groupId>
64+
<artifactId>thrift-maven-plugin</artifactId>
65+
<version>0.10.0</version>
66+
<configuration>
67+
<generator>java:fullcamel</generator>
68+
<thriftExecutable>${project.parent.basedir}/../thirdparty/installed/bin/thrift</thriftExecutable>
69+
<thriftSourceRoot>${project.parent.basedir}/../gensrc/thrift</thriftSourceRoot>
70+
</configuration>
71+
<executions>
72+
<execution>
73+
<id>thrift-sources</id>
74+
<phase>generate-sources</phase>
75+
<goals>
76+
<goal>compile</goal>
77+
</goals>
78+
</execution>
79+
</executions>
80+
</plugin>
6281
</plugins>
6382
</build>
6483
</project>

fe/fe-type/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ under the License.
6363
</dependencies>
6464

6565
<build>
66-
<finalName>doris-fe-catalog</finalName>
66+
<finalName>doris-fe-type</finalName>
6767
<directory>${project.basedir}/target/</directory>
6868
<plugins>
6969
<!-- Build source jar -->

generated-source.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ rm -rf "${DORIS_HOME}/fe/fe-thrift/src/main/java/org/apache/doris/thrift" "${DOR
4545
rm -rf "${DORIS_HOME}/fe/fe-common/src/main/java/org/apache/doris/thrift" "${DORIS_HOME}/fe/fe-common/src/main/java/org/apache/parquet"
4646
rm -rf "${DORIS_HOME}/fe/fe-core/src/main/java/org/apache/doris/thrift" "${DORIS_HOME}/fe/fe-core/src/main/java/org/apache/parquet"
4747

48-
cp -r "build/gen_java/org/apache/doris/thrift" "${DORIS_HOME}/fe/fe-thrift/src/main/java/org/apache/doris"
49-
cp -r "build/gen_java/org/apache/parquet" "${DORIS_HOME}/fe/fe-thrift/src/main/java/org/apache/"
5048
cd "${DORIS_HOME}/"
5149
echo "Done"
5250
exit 0

gensrc/thrift/Makefile

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,10 @@ GEN_OBJECTS = $(patsubst ${BUILD_DIR}/thrift/%.thrift, ${BUILD_DIR}/gen_cpp/%_ty
2929
all: ${GEN_OBJECTS} ${OBJECTS}
3030
.PHONY: all
3131

32-
$(shell mkdir -p ${BUILD_DIR}/gen_java)
33-
3432
THRIFT_CPP_ARGS = -I ${CURDIR} -I ${BUILD_DIR}/thrift/ --gen cpp:moveable_types,no_skeleton -out ${BUILD_DIR}/gen_cpp --allow-64bit-consts -strict
35-
THRIFT_JAVA_ARGS = -I ${CURDIR} -I ${BUILD_DIR}/thrift/ --gen java:fullcamel -out ${BUILD_DIR}/gen_java --allow-64bit-consts -strict
3633

3734
${BUILD_DIR}/gen_cpp:
3835
mkdir -p $@
3936
# handwrite thrift
4037
${BUILD_DIR}/gen_cpp/%_types.cpp: ${CURDIR}/%.thrift | ${BUILD_DIR}/gen_cpp
4138
${THRIFT} ${THRIFT_CPP_ARGS} $<
42-
${THRIFT} ${THRIFT_JAVA_ARGS} $<
43-
44-
# generated thrift
45-
${BUILD_DIR}/gen_cpp/%_types.cpp: ${BUILD_DIR}/thrift/%.thrift | ${BUILD_DIR}/gen_cpp
46-
${THRIFT} ${THRIFT_CPP_ARGS} $<
47-
${THRIFT} ${THRIFT_JAVA_ARGS} $<

0 commit comments

Comments
 (0)