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

提交 hive集成spark2.3.4 #538

Open
wants to merge 1 commit into
base: branch-1.2.1
Choose a base branch
from
Open

提交 hive集成spark2.3.4 #538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion datasophon-api/src/main/resources/meta/DDP-1.2.1/HIVE/control_hive.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#

usage="Usage: start.sh (start|stop|restart) <command> "

source /opt/datasophon/datasophon-worker/script/datasophon-env.sh
# if no args specified, show usage
if [ $# -le 1 ]; then
echo $usage
Expand Down
11 changes: 8 additions & 3 deletions datasophon-ui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
<artifactId>datasophon-ui</artifactId>

<properties>
<build.node.version>v12.16.3</build.node.version>
<build.npm.version>6.14.4</build.npm.version>
<!-- <build.node.version>v12.16.3</build.node.version>-->
<build.node.version>v16.19.0</build.node.version>
<!-- <build.npm.version>6.14.4</build.npm.version>-->
<build.npm.version>9.8.1</build.npm.version>
<deployed.dir>.deployed</deployed.dir>
<dist.dir>dist</dist.dir>
<nodemodules.dir>node_modules</nodemodules.dir>
Expand Down Expand Up @@ -68,7 +70,9 @@
<npmVersion>${build.npm.version}</npmVersion>

<nodeDownloadRoot>https://npm.taobao.org/mirrors/node/</nodeDownloadRoot>
<!-- <nodeDownloadRoot>https://mirrors.huaweicloud.com/repository/node/</nodeDownloadRoot>-->
<npmDownloadRoot>https://registry.npm.taobao.org/npm/-/</npmDownloadRoot>
<!-- <npmDownloadRoot>https://mirrors.huaweicloud.com/repository/npm/</npmDownloadRoot>-->
</configuration>
<executions>
<execution>
Expand All @@ -85,7 +89,8 @@
</goals>
<phase>generate-resources</phase>
<configuration>
<arguments>install --registry=https://registry.npm.taobao.org --sass-binary-site=https://npm.taobao.org/mirrors/node-sass</arguments>
<arguments>install</arguments>
<!-- <arguments>install &#45;&#45;registry=https://registry.npm.taobao.org &#45;&#45;sass-binary-site=https://npm.taobao.org/mirrors/node-sass</arguments>-->
</configuration>
</execution>
<execution>
Expand Down
3 changes: 2 additions & 1 deletion datasophon-worker/src/main/resources/script/datasophon-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ CLASSPATH=.:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar
export JAVA_HOME CLASSPATH

export KYUUBI_HOME=/opt/datasophon/kyuubi-1.7.3
export SPARK_HOME=/opt/datasophon/spark-3.1.3
# export SPARK_HOME=/opt/datasophon/spark-3.1.3
export SPARK_HOME=/opt/datasophon/spark2
export PYSPARK_ALLOW_INSECURE_GATEWAY=1
export HIVE_HOME=/opt/datasophon/hive-3.1.0

Expand Down