diff --git bin/ext/hiveserver.cmd bin/ext/hiveserver.cmd deleted file mode 100644 index 1f0e717..0000000 --- bin/ext/hiveserver.cmd +++ /dev/null @@ -1,48 +0,0 @@ -@echo off -@rem Licensed to the Apache Software Foundation (ASF) under one or more -@rem contributor license agreements. See the NOTICE file distributed with -@rem this work for additional information regarding copyright ownership. -@rem The ASF licenses this file to You under the Apache License, Version 2.0 -@rem (the "License"); you may not use this file except in compliance with -@rem the License. You may obtain a copy of the License at -@rem -@rem http://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. - -set CLASS=org.apache.hadoop.hive.service.HiveServer -pushd %HIVE_LIB% -for /f %%a IN ('dir /b hive-service-*.jar') do ( - set JAR=%HIVE_LIB%\%%a -) -popd - -if [%1]==[hiveserver_help] goto :hiveserver_help - -if [%1]==[hiveserver_catservice] goto :hiveserver_catservice - -:hiveserver - echo "Starting Hive Thrift Server" - - @rem hadoop 20 or newer - skip the aux_jars option and hiveconf - call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS% -goto :EOF - -:hiveserver_help - set HIVEARGS=-h - goto :hiveserver -goto :EOF - -:hiveserver_catservice -@echo ^ -@echo ^HiveServer^ -@echo ^HiveServer^ -@echo ^Hadoop HiveServer Service^ -@echo ^%JAVA_HOME%\bin\java^ -@echo ^%JAVA_HEAP_MAX% %HADOOP_OPTS% %AUX_PARAM% -classpath %CLASSPATH% %CLASS% -hiveconf hive.hadoop.classpath=%HIVE_LIB%\* %HIVE_OPTS%^ -@echo ^ -goto :EOF diff --git bin/ext/hiveserver.sh bin/ext/hiveserver.sh deleted file mode 100644 index 7335b83..0000000 --- bin/ext/hiveserver.sh +++ /dev/null @@ -1,35 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -THISSERVICE=hiveserver -export SERVICE_LIST="${SERVICE_LIST}${THISSERVICE} " - -hiveserver() { - echo "Starting Hive Thrift Server" - CLASS=org.apache.hadoop.hive.service.HiveServer - if $cygwin; then - HIVE_LIB=`cygpath -w "$HIVE_LIB"` - fi - JAR=${HIVE_LIB}/hive-service-*.jar - - # hadoop 20 or newer - skip the aux_jars option and hiveconf - - exec $HADOOP jar $JAR $CLASS $HIVE_OPTS "$@" -} - -hiveserver_help() { - hiveserver -h -} - diff --git bin/hive.cmd bin/hive.cmd index 9080796..fff7c8a 100644 --- bin/hive.cmd +++ bin/hive.cmd @@ -336,9 +336,6 @@ goto :EOF set VAR%SERVICE_COUNT%=help set /a SERVICE_COUNT = %SERVICE_COUNT% + 1 - set VAR%SERVICE_COUNT%=hiveserver - - set /a SERVICE_COUNT = %SERVICE_COUNT% + 1 set VAR%SERVICE_COUNT%=hiveserver2 set /a SERVICE_COUNT = %SERVICE_COUNT% + 1