You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by gu...@apache.org on 2017/02/11 20:59:52 UTC
[7/7] hive git commit: HIVE-15873: Remove Windows-specific code
(Gunther Hagleitner, reviewed by Ashtuosh Chauhan)
HIVE-15873: Remove Windows-specific code (Gunther Hagleitner, reviewed by Ashtuosh Chauhan)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/38ad7792
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/38ad7792
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/38ad7792
Branch: refs/heads/master
Commit: 38ad77929980dc155dcc4a5d009a9a855eb5b017
Parents: eb1da30
Author: Gunther Hagleitner <gu...@apache.org>
Authored: Thu Feb 9 17:49:50 2017 -0800
Committer: Gunther Hagleitner <gu...@apache.org>
Committed: Sat Feb 11 12:52:46 2017 -0800
----------------------------------------------------------------------
bin/beeline.cmd | 66 -
bin/derbyserver.cmd | 60 -
bin/ext/cleardanglingscratchdir.cmd | 34 -
bin/ext/cli.cmd | 58 -
bin/ext/debug.cmd | 110 -
bin/ext/hbaseimport.cmd | 35 -
bin/ext/help.cmd | 30 -
bin/ext/hiveserver2.cmd | 139 --
bin/ext/jar.cmd | 43 -
bin/ext/lineage.cmd | 30 -
bin/ext/metastore.cmd | 47 -
bin/ext/orcfiledump.cmd | 35 -
bin/ext/rcfilecat.cmd | 34 -
bin/ext/schemaTool.cmd | 33 -
bin/ext/util/execHiveCmd.cmd | 24 -
bin/hive-config.cmd | 61 -
bin/hive.cmd | 383 ----
bin/hplsql.cmd | 58 -
.../hadoop/hive/cli/TestCliDriverMethods.java | 28 -
.../apache/hadoop/hive/common/FileUtils.java | 9 -
.../org/apache/hadoop/hive/conf/HiveConf.java | 4 +-
.../java/org/apache/hive/http/HttpServer.java | 2 +-
.../apache/hadoop/hive/conf/TestHiveConf.java | 5 -
.../hadoop/hive/contrib/mr/TestGenericMR.java | 13 +-
hcatalog/bin/templeton.cmd | 90 -
.../hive/hcatalog/mapreduce/HCatBaseTest.java | 4 -
.../mapreduce/TestHCatPartitionPublish.java | 11 +-
.../pig/TestHCatLoaderComplexSchema.java | 5 -
.../hcatalog/pig/TestHCatLoaderEncryption.java | 11 +-
.../e2e/templeton/drivers/TestDriverCurl.pm | 1984 +++++++++--------
.../hive/hcatalog/api/TestHCatClient.java | 7 -
.../hcatalog/templeton/ExecServiceImpl.java | 48 +-
.../hive/hcatalog/templeton/HiveDelegator.java | 9 +-
.../hive/hcatalog/templeton/JarDelegator.java | 9 +-
.../hive/hcatalog/templeton/PigDelegator.java | 5 +-
.../hive/hcatalog/templeton/SqoopDelegator.java | 7 +-
.../hcatalog/templeton/StreamingDelegator.java | 4 +-
.../hcatalog/templeton/tool/LaunchMapper.java | 9 -
.../hcatalog/templeton/tool/TempletonUtils.java | 42 -
.../org/apache/hive/jdbc/miniHS2/MiniHS2.java | 3 +-
.../hive/ql/TestReplicationScenarios.java | 3 -
.../security/StorageBasedMetastoreTestBase.java | 4 -
.../ql/session/TestClearDanglingScratchDir.java | 4 -
.../server/TestHS2ClearDanglingScratchDir.java | 4 -
.../org/apache/hadoop/hive/ql/QTestUtil.java | 55 +-
.../llap/shufflehandler/ShuffleHandler.java | 5 +-
.../hive/llap/daemon/MiniLlapCluster.java | 36 +-
.../hadoop/hive/ql/exec/ScriptOperator.java | 17 -
.../apache/hadoop/hive/ql/exec/Utilities.java | 16 -
.../apache/hadoop/hive/ql/util/DosToUnix.java | 107 -
.../hadoop/hive/ql/util/ResourceDownloader.java | 12 +-
.../apache/hadoop/hive/ql/WindowsPathUtil.java | 57 -
.../hadoop/hive/ql/exec/TestExecDriver.java | 8 +-
.../ql/metadata/TestHiveMetaStoreChecker.java | 4 -
.../hadoop/hive/ql/session/TestAddResource.java | 8 +-
.../hadoop/hive/ql/util/TestDosToUnix.java | 77 -
.../queries/clientpositive/avro_timestamp.q | 2 -
.../queries/clientpositive/avro_timestamp_win.q | 28 -
ql/src/test/queries/clientpositive/combine2.q | 3 -
.../queries/clientpositive/combine2_hadoop20.q | 3 -
.../test/queries/clientpositive/combine2_win.q | 41 -
ql/src/test/queries/clientpositive/escape1.q | 3 -
ql/src/test/queries/clientpositive/escape2.q | 3 -
.../test/queries/clientpositive/input_part10.q | 3 -
.../queries/clientpositive/input_part10_win.q | 23 -
.../queries/clientpositive/load_dyn_part14.q | 3 -
.../clientpositive/load_dyn_part14_win.q | 38 -
.../clientpositive/partition_timestamp.q | 2 -
.../clientpositive/partition_timestamp2.q | 2 -
.../clientpositive/partition_timestamp2_win.q | 58 -
.../clientpositive/partition_timestamp_win.q | 59 -
.../test/queries/clientpositive/scriptfile1.q | 2 -
.../queries/clientpositive/scriptfile1_win.q | 16 -
.../queries/clientpositive/transform_acid.q | 2 -
.../vector_partitioned_date_time.q | 3 -
.../vector_partitioned_date_time_win.q | 129 --
.../avro_timestamp_win.q.java1.7.out | 134 --
.../avro_timestamp_win.q.java1.8.out | 134 --
.../results/clientpositive/combine2_win.q.out | 767 -------
.../clientpositive/input_part10_win.q.out | 131 --
.../clientpositive/load_dyn_part14_win.q.out | 298 ---
.../partition_timestamp2_win.q.out | 399 ----
.../partition_timestamp_win.q.out | 316 ---
.../clientpositive/scriptfile1_win.q.out | 55 -
.../vector_partitioned_date_time_win.q.out | 2036 ------------------
.../cli/thrift/ThriftHttpCLIService.java | 2 +-
.../apache/hadoop/fs/ProxyLocalFileSystem.java | 8 -
testutils/hadoop.cmd | 252 ---
88 files changed, 1025 insertions(+), 7936 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/beeline.cmd
----------------------------------------------------------------------
diff --git a/bin/beeline.cmd b/bin/beeline.cmd
deleted file mode 100644
index 971e20b..0000000
--- a/bin/beeline.cmd
+++ /dev/null
@@ -1,66 +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.
-SetLocal EnableDelayedExpansion
-
-pushd %CD%\..
-if not defined HIVE_HOME (
- set HIVE_HOME=%CD%
-)
-popd
-
-if "%HADOOP_BIN_PATH:~-1%" == "\" (
- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
-)
-
-if not defined JAVA_HOME (
- echo Error: JAVA_HOME is not set.
- goto :eof
-)
-
-@rem get the hadoop envrionment
-if not exist %HADOOP_HOME%\libexec\hadoop-config.cmd (
- @echo +================================================================+
- @echo ^| Error: HADOOP_HOME is not set correctly ^|
- @echo +----------------------------------------------------------------+
- @echo ^| Please set your HADOOP_HOME variable to the absolute path of ^|
- @echo ^| the directory that contains \libexec\hadoop-config.cmd ^|
- @echo +================================================================+
- exit /b 1
-)
-@rem supress the HADOOP_HOME warnings in 1.x.x
-set HADOOP_HOME_WARN_SUPPRESS=true
-
-@rem include only the beeline client jar and its dependencies
-pushd %HIVE_HOME%\lib
-for /f %%a IN ('dir /b hive-beeline-**.jar') do (
- set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%HIVE_HOME%\lib\%%a
-)
-for /f %%a IN ('dir /b super-csv-**.jar') do (
- set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%HIVE_HOME%\lib\%%a
-)
-for /f %%a IN ('dir /b jline-**.jar') do (
- set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%HIVE_HOME%\lib\%%a
-)
-for /f %%a IN ('dir /b hive-jdbc-**-standalone.jar') do (
- set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%HIVE_HOME%\lib\%%a
-)
-popd
-set HADOOP_USER_CLASSPATH_FIRST=true
-call %HADOOP_HOME%\libexec\hadoop-config.cmd
-
-call %JAVA_HOME%\bin\java %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% org.apache.hive.beeline.BeeLine %*
-
-endlocal
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/derbyserver.cmd
----------------------------------------------------------------------
diff --git a/bin/derbyserver.cmd b/bin/derbyserver.cmd
deleted file mode 100644
index 386df80..0000000
--- a/bin/derbyserver.cmd
+++ /dev/null
@@ -1,60 +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.
-@rem
-setlocal enabledelayedexpansion
-
-set hadoop-config-script=%HADOOP_HOME%\libexec\yarn-config.cmd
-call %hadoop-config-script%
-
-pushd %HIVE_HOME%\lib
-for /f %%a IN ('dir /b derby*.jar') do (
- call :SetClasspath %HIVE_HOME%\lib\%%a
-)
-popd
-
-set CLASS=org.apache.derby.drda.NetworkServerControl
-
-if [%1]==[catservicexml] goto :derbyservice_catservice
-
-:derbyserver
-
- if "%1" == "--config" (
- shift
- set HADOOP_CONF_DIR=%2
- shift
-
- if exist %HADOOP_CONF_DIR%\hadoop-env.cmd (
- call %HADOOP_CONF_DIR%\hadoop-env.cmd
- )
- )
-
- call %JAVA% %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% start -h 0.0.0.0 -noSecurityManager
-goto :EOF
-
-:SetClasspath
- set CLASSPATH=%CLASSPATH%;%1
-goto :EOF
-
-:derbyservice_catservice
-@echo ^<service^>
-@echo ^<id^>derbyserver^</id^>
-@echo ^<name^>derbyserver^</name^>
-@echo ^<description^>Derby Service^</description^>
-@echo ^<executable^>%JAVA_HOME%\bin\java^</executable^>
-@echo ^<arguments^>%JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %CLASSPATH% %CLASS% start -h 0.0.0.0 -noSecurityManager^</arguments^>
-@echo ^</service^>
-goto :EOF
-endlocal
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/cleardanglingscratchdir.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/cleardanglingscratchdir.cmd b/bin/ext/cleardanglingscratchdir.cmd
deleted file mode 100644
index 1bb0453..0000000
--- a/bin/ext/cleardanglingscratchdir.cmd
+++ /dev/null
@@ -1,34 +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.ql.session.ClearDanglingScratchDir
-set HIVE_OPTS=
-
-pushd %HIVE_LIB%
-for /f %%a IN ('dir /b hive-exec-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
-)
-popd
-
-if [%1]==[cleardanglingscratchdir_help] goto :cleardanglingscratchdir_help
-
-:cleardanglingscratchdir
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:cleardanglingscratchdir_help
- echo "usage hive --service cleardanglingscratchdir"
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/cli.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/cli.cmd b/bin/ext/cli.cmd
deleted file mode 100644
index 74a1596..0000000
--- a/bin/ext/cli.cmd
+++ /dev/null
@@ -1,58 +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.
-
-if [%1]==[cli_help] goto :cli_help
-
-:cli
- call :update_cli
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:cli_help
- call :update_cli
- set HIVEARGS=--help
- call :cli
-goto :EOF
-
-:update_cli
- if [%USE_DEPRECATED_CLI%] == [] (
- set USE_DEPRECATED_CLI=true
- )
-
- if /I "%USE_DEPRECATED_CLI%" == "true" (
- call :old_cli
- ) else (
- call :new_cli
- )
-goto :EOF
-
-:old_cli
- set CLASS=org.apache.hadoop.hive.cli.CliDriver
- pushd %HIVE_LIB%
- for /f %%a IN ('dir /b hive-cli-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
- )
- popd
-goto :EOF
-
-:new_cli
- set CLASS=org.apache.hive.beeline.cli.HiveCli
- pushd %HIVE_LIB%
- for /f %%a IN ('dir /b hive-beeline-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
- )
- popd
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/debug.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/debug.cmd b/bin/ext/debug.cmd
deleted file mode 100644
index 2baf831..0000000
--- a/bin/ext/debug.cmd
+++ /dev/null
@@ -1,110 +0,0 @@
-@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.
-@echo off
-
-set RECURSIVE=
-set PORT=
-set MAINSUSPEND=
-set CHILDSUSPEND=
-set SWAPSUSPEND=
-set HIVE_MAIN_CLIENT_DEBUG_OPTS=
-set HIVE_CHILD_CLIENT_DEBUG_OPTS=
-if %1==HELP (
- goto :debug_help
-) else (
- call :get_debug_params %*
-)
-
-@rem must use java 1.5 or later prereq
-:ParseDebugArgs
- :ProcessDebugArgsLoop
- if [%1]==[] goto :EndProcessDebug
-
- set params=%1
- set temp=%params:~0, 8%
-
- @rem trim off the --debug[ if it is the 1st param
- if %temp%==--debug[ (
- set params=%params:--debug[=%
- )
-
- @rem trim off the ] if necessary on the value of the param
- set value=%2
- set value=%value:]=%
-
- if %params%==recursive (
- set RECURSIVE=%value%
- shift
- shift
- goto :ProcessDebugArgsLoop
- )
-
- if %params%==port (
- set PORT=%value%
- shift
- shift
- goto :ProcessDebugArgsLoop
- )
-
- if %params%==mainSuspend (
- set MAINSUSPEND=%value%
- shift
- shift
- goto :ProcessDebugArgsLoop
- )
- if %params%==childSuspend (
- set CHILDSUSPEND=%value%
- shift
- shift
- goto :ProcessDebugArgsLoop
- )
- if %params%==swapSuspend (
- set childTemp=%CHILDSUSPEND%
- set CHILDSUSPEND=%MAINSUSPEND%
- set MAINSUSPEND=%childTemp%
- shift
- goto :ProcessDebugArgsLoop
- )
-
- shift
- goto :ProcessDebugArgsLoop
-
- :EndProcessDebug
-goto :EOF
-
-:set_debug_defaults
- set RECURSIVE="y"
- set PORT=address=8000
- set MAINSUSPEND=suspend=y
- set CHILDSUSPEND=suspend=n
-goto :EOF
-
-:get_debug_params
- call :set_debug_defaults
- call :ParseDebugArgs %*
- set HIVE_MAIN_CLIENT_DEBUG_OPTS= -XX:+UseParallelGC -Xdebug -Xrunjdwp:transport=dt_socket,server=y,%PORT%,%MAINSUSPEND%
- set HIVE_CHILD_CLIENT_DEBUG_OPTS= -XX:+UseParallelGC -Xdebug -Xrunjdwp:transport=dt_socket,server=y,%CHILDSUSPEND%
-goto :EOF
-
-:debug_help
- echo "Allows to debug Hive by connecting to it via JDI API"
- echo "Usage: hive --debug[:comma-separated parameters list]"
- echo "Parameters:"
- echo "recursive=<y|n> Should child JVMs also be started in debug mode. Default: y"
- echo "port=<port_number> Port on which main JVM listens for debug connection. Default: 8000"
- echo "mainSuspend=<y|n> Should main JVM wait with execution for the debugger to connect. Default: y"
- echo "childSuspend=<y|n> Should child JVMs wait with execution for the debugger to connect. Default: n"
- echo "swapSuspend Swaps suspend options between main and child JVMs"
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/hbaseimport.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/hbaseimport.cmd b/bin/ext/hbaseimport.cmd
deleted file mode 100644
index ff69007..0000000
--- a/bin/ext/hbaseimport.cmd
+++ /dev/null
@@ -1,35 +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.metastore.hbase.HBaseImport
-set HIVE_OPTS=
-set HADOOP_CLASSPATH=
-
-pushd %HIVE_LIB%
-for /f %%a IN ('dir /b hive-exec-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
-)
-popd
-
-if [%1]==[hbaseimport_help] goto :hbaseimport_help
-
-:hbaseimport
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:hbaseimport_help
- echo "usage hive --hbaseimport"
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/help.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/help.cmd b/bin/ext/help.cmd
deleted file mode 100644
index abd429d..0000000
--- a/bin/ext/help.cmd
+++ /dev/null
@@ -1,30 +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.
-
-:help
- echo "Usage ./hive <parameters> --service serviceName <service parameters>"
- echo "Service List: $SERVICE_LIST"
- echo "Parameters parsed:"
- echo " --auxpath : Auxiliary jars "
- echo " --config : Hive configuration directory"
- echo " --service : Starts specific service/component. cli is default"
- echo "Parameters used:"
- echo " HADOOP_HOME or HADOOP_PREFIX : Hadoop install directory"
- echo " HIVE_OPT : Hive options"
- echo "For help on a particular service:"
- echo " ./hive --service serviceName --help"
- echo "Debug help: ./hive --debug --help"
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/hiveserver2.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/hiveserver2.cmd b/bin/ext/hiveserver2.cmd
deleted file mode 100644
index 26c954c..0000000
--- a/bin/ext/hiveserver2.cmd
+++ /dev/null
@@ -1,139 +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.hive.service.server.HiveServer2
-pushd %HIVE_LIB%
-for /f %%a IN ('dir /b hive-service-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
-)
-popd
-
-if defined HBASE_HOME (
- dir %HBASE_HOME%\lib > nul
- if %errorlevel%==0 (
- pushd %HBASE_HOME%\lib
- set HIVE_HBASE_PATH=
- for /f %%a IN ('dir /b hbase-server-**-hadoop2.jar') do (
- call :AddToHiveHbasePath %HBASE_HOME%\lib\%%a
- )
- for /f %%a IN ('dir /b hbase-client-**-hadoop2.jar') do (
- call :AddToHiveHbasePath %HBASE_HOME%\lib\%%a
- )
- for /f %%a IN ('dir /b hbase-protocol-**-hadoop2.jar') do (
- call :AddToHiveHbasePath %HBASE_HOME%\lib\%%a
- )
- for /f %%a IN ('dir /b htrace-core-**.jar') do (
- call :AddToHiveHbasePath %HBASE_HOME%\lib\%%a
- )
- for /f %%a IN ('dir /b hbase-common-**-hadoop2.jar') do (
- call :AddToHiveHbasePath %HBASE_HOME%\lib\%%a
- )
- for /f %%a IN ('dir /b hbase-hadoop-compat-**-hadoop2.jar') do (
- call :AddToHiveHbasePath %HBASE_HOME%\lib\%%a
- )
- )
- popd
- if defined HBASE_CONF_DIR (
- dir %HBASE_CONF_DIR% > nul
- if %errorlevel%==0 (
- call :AddToHiveHbasePath %HBASE_CONF_DIR%
- )
- )
- )
-)
-
-@rem add auxilary jars such as serdes
-if not defined HIVE_AUX_JARS_PATH goto :AddMiscAuxLibDir
-
-setLocal EnableDelayedExpansion
-:auxJarLoop
- for /f "delims=," %%a in ("!HIVE_AUX_JARS_PATH!") do (
- set auxjar=%%a
- if exist %%a (
- if exist "%%a\nul" (
- @rem %%a is a dir
- pushd %%a
- for /f %%b IN ('dir /b *.jar') do (
- call :AddToAuxJavaParam %%a\%%b
- )
- popd
- ) else (
- @rem %%a is a file
- call :AddToAuxJavaParam %%a
- )
- )
- )
- :striploop
- set stripchar=!HIVE_AUX_JARS_PATH:~0,1!
- set HIVE_AUX_JARS_PATH=!HIVE_AUX_JARS_PATH:~1!
- if "!HIVE_AUX_JARS_PATH!" EQU "" goto auxJarLoopEnd
- if "!stripchar!" NEQ "," goto striploop
- goto auxJarLoop
-
-:auxJarLoopEnd
-
-:AddMiscAuxLibDir
-@rem adding jars from hcatalog\share\hcatalog directory
-if exist %HIVE_HOME%\hcatalog\share\hcatalog (
- pushd %HIVE_HOME%\hcatalog\share\hcatalog
- for /f %%a IN ('dir /b *.jar') do (
- call :AddToAuxJavaParam %HIVE_HOME%\hcatalog\share\hcatalog\%%a
- )
- popd
-)
-
-if [%1]==[hiveserver2_help] goto :hiveserver2_help
-
-if [%1]==[hiveserver2_catservice] goto :hiveserver2_catservice
-
-:hiveserver2
-
- @rem hadoop 20 or newer - skip the aux_jars option and hiveconf
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:hiveserver2_help
- set HIVEARGS=-h
- goto :hiveserver2
-goto :EOF
-
-:hiveserver2_catservice
-@echo ^<service^>
-@echo ^<id^>HiveServer2^</id^>
-@echo ^<name^>HiveServer2^</name^>
-@echo ^<description^>Hadoop HiveServer2 Service^</description^>
-@echo ^<executable^>%JAVA_HOME%\bin\java^</executable^>
-@echo ^<arguments^>%JAVA_HEAP_MAX% -XX:MaxPermSize=512m %HADOOP_OPTS% -classpath %CLASSPATH%;%HIVE_HBASE_PATH%;%HIVE_HOME%\hcatalog\share\hcatalog\* %CLASS% -hiveconf hive.hadoop.classpath=%HIVE_LIB%\*;%HIVE_HOME%\hcatalog\share\hcatalog\* -hiveconf hive.security.authorization.manager=org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory -hiveconf hive.security.authenticator.manager=org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator -hiveconf hive.metastore.uris=" " -hiveconf hive.aux.jars.path=%AUX_JAVA_PARAM% %HIVE_OPTS%^</arguments^>
-@echo ^</service^>
-goto :EOF
-
-:AddToHiveHbasePath
-if not defined HIVE_HBASE_PATH (
- set HIVE_HBASE_PATH=%1
- ) else (
- set HIVE_HBASE_PATH=%HIVE_HBASE_PATH%;%1
- )
-)
-goto :EOF
-
-:AddToAuxJavaParam
-if not defined AUX_JAVA_PARAM (
- set AUX_JAVA_PARAM=file:///%1
- ) else (
- set AUX_JAVA_PARAM=%AUX_JAVA_PARAM%,file:///%1
- )
-)
-goto :EOF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/jar.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/jar.cmd b/bin/ext/jar.cmd
deleted file mode 100644
index e5ab875..0000000
--- a/bin/ext/jar.cmd
+++ /dev/null
@@ -1,43 +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.
-
-if [%1]==[jar_help] goto :jar_help
-
-:jar
-
- set RUNJAR=%1
- shift
-
- set RUNCLASS=%1
- shift
-
- if "%RUNJAR%"== ""(
- echo "RUNJAR not specified"
- exit 3
- )
-
- if "%RUNCLASS%" == "" (
- echo "RUNCLASS not specified"
- exit 3
- )
- @rem hadoop 20 or newer - skip the aux_jars option and hiveconf
- %HADOOP% jar %$RUNJAR% %RUNCLASS% %HIVE_OPTS% %*
-goto :EOF
-
-:jar_help
- echo "Used for applications that require Hadoop and Hive classpath and environment."
- echo "./hive --service jar <yourjar> <yourclass> HIVE_OPTS <your_args>"
-goto :EOF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/lineage.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/lineage.cmd b/bin/ext/lineage.cmd
deleted file mode 100644
index 03e4f56..0000000
--- a/bin/ext/lineage.cmd
+++ /dev/null
@@ -1,30 +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.ql.tools.LineageInfo
-
-if [%1]==[lineage_help] goto :lineage_help
-
-:lineage
- if not exist %HIVE_LIB%/hive-exec-*.jar (
- echo "Missing Hive exec Jar"
- )
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:lineage_help
- echo "usage hive.cmd 'hql' "
-goto :EOF
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/metastore.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/metastore.cmd b/bin/ext/metastore.cmd
deleted file mode 100644
index 68d17ab..0000000
--- a/bin/ext/metastore.cmd
+++ /dev/null
@@ -1,47 +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.metastore.HiveMetaStore
-pushd %HIVE_LIB%
-for /f %%a IN ('dir /b hive-metastore-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
-)
-popd
-if [%1]==[metastore_help] goto :metastore_help
-
-if [%1]==[metastore_catservice] goto :metastore_catservice
-
-:metastore
- echo "Starting Hive Metastore Server"
- @rem hadoop 20 or newer - skip the aux_jars option and hiveconf
- set HADOOP_OPTS=%HIVE_METASTORE_HADOOP_OPTS% %HADOOP_OPTS%
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:metastore_help
- set HIVEARGS=-h
- call :metastore
-goto :EOF
-
-:metastore_catservice
-@echo ^<service^>
-@echo ^<id^>Metastore^</id^>
-@echo ^<name^>Metastore^</name^>
-@echo ^<description^>Hadoop Metastore Service^</description^>
-@echo ^<executable^>%JAVA_HOME%\bin\java^</executable^>
-@echo ^<arguments^>%JAVA_HEAP_MAX% %HADOOP_OPTS% %AUX_PARAM% -classpath %CLASSPATH% %CLASS% %HIVE_OPTS%^</arguments^>
-@echo ^</service^>
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/orcfiledump.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/orcfiledump.cmd b/bin/ext/orcfiledump.cmd
deleted file mode 100644
index ff4b410..0000000
--- a/bin/ext/orcfiledump.cmd
+++ /dev/null
@@ -1,35 +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.orc.tools.FileDump
-set HIVE_OPTS=
-set HADOOP_CLASSPATH=
-
-pushd %HIVE_LIB%
-for /f %%a IN ('dir /b hive-exec-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
-)
-popd
-
-if [%1]==[orcfiledump_help] goto :orcfiledump_help
-
-:orcfiledump
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:orcfiledump_help
- echo "usage hive --orcfiledump [-d] [--rowindex=_csv_col_ids_] [-t] [-j] [-p] [--recover] [--skip-dump] [--backup-path=_path_for_backup_] <path_to_orc_file>"
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/rcfilecat.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/rcfilecat.cmd b/bin/ext/rcfilecat.cmd
deleted file mode 100644
index 324e926..0000000
--- a/bin/ext/rcfilecat.cmd
+++ /dev/null
@@ -1,34 +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.cli.RCFileCat
-set HIVE_OPTS=
-
-pushd %HIVE_LIB%
-for /f %%a IN ('dir /b hive-cli-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
-)
-popd
-
-if [%1]==[rcfilecat_help] goto :rcfilecat_help
-
-:rcfilecat
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:rcfilecat_help
- echo "usage ./hive rcfilecat [--start='startoffset'] [--length='len'] "
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/schemaTool.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/schemaTool.cmd b/bin/ext/schemaTool.cmd
deleted file mode 100644
index c85886d..0000000
--- a/bin/ext/schemaTool.cmd
+++ /dev/null
@@ -1,33 +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.hive.beeline.HiveSchemaTool
-set HIVE_OPTS=
-pushd %HIVE_LIB%
-for /f %%a IN ('dir /b hive-beeline-*.jar') do (
- set JAR=%HIVE_LIB%\%%a
-)
-popd
-
-if [%1]==[schematool_help] goto :schematool_help
-
-:schematool
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS%
-goto :EOF
-
-:schematool_help
- call %HIVE_BIN_PATH%\ext\util\execHiveCmd.cmd %CLASS% --help
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/ext/util/execHiveCmd.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/util/execHiveCmd.cmd b/bin/ext/util/execHiveCmd.cmd
deleted file mode 100644
index 1f5ef49..0000000
--- a/bin/ext/util/execHiveCmd.cmd
+++ /dev/null
@@ -1,24 +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.
-
-if [%1]==[] (
- echo "No class set to run. Please specify the class to run."
- exit /b 1
-)
-set CLASS=%1
-@rem hadoop 20 or newer - skip the aux_jars option. picked up from hiveconf
-call %HADOOP% jar %JAR% %CLASS% %HIVE_OPTS% %HIVEARGS%
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/hive-config.cmd
----------------------------------------------------------------------
diff --git a/bin/hive-config.cmd b/bin/hive-config.cmd
deleted file mode 100644
index 5f2f914..0000000
--- a/bin/hive-config.cmd
+++ /dev/null
@@ -1,61 +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.
-
-
-@rem processes --config and --auxpath option from command line
-
-if defined HIVE_HOME goto :DoneSetHiveHome
-set HIVE_HOME=%~dp0
-for %%i in (%HIVE_HOME%.) do (
- set HIVE_HOME=%%~dpi
-)
-
-if "%HIVE_HOME:~-1%" == "\" (
- set HIVE_HOME=%HIVE_HOME:~0,-1%
-)
-
-:DoneSetHiveHome
-set HIVE_CONF_DIR=
-rem set HIVE_AUX_JARS_PATH=
-:Loop
- if [%1]==[] GOTO :FinishLoop
-
- if [%1]==[--config] (
- goto :SetConfig
- )
-
- if [%1]==[--auxpath] (
- goto :SetAux
- )
-
- @rem current argument does not match any aux params, finish loop here
- goto :FinishLoop
- SHIFT
- GOTO Loop
-
- :SetConfig
- set HIVE_CONF_DIR=%2
- shift
- shift
- goto :Loop
-
- :SetAux
- set HIVE_AUX_JARS_PATH=%2
- shift
- shift
- goto :Loop
-
-:FinishLoop
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/hive.cmd
----------------------------------------------------------------------
diff --git a/bin/hive.cmd b/bin/hive.cmd
deleted file mode 100644
index a1e4806..0000000
--- a/bin/hive.cmd
+++ /dev/null
@@ -1,383 +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.
-SetLocal EnableDelayedExpansion
-
-@rem Set the path
-
-if not defined HIVE_BIN_PATH (
- set HIVE_BIN_PATH=%~dp0
-)
-
-if "%HIVE_BIN_PATH:~-1%" == "\" (
- set HIVE_BIN_PATH=%HIVE_BIN_PATH:~0,-1%
-)
-
-set HIVE_CONFIG_SCRIPT=%HIVE_BIN_PATH%\hive-config.cmd
-
-if exist %HIVE_CONFIG_SCRIPT% (
- CALL %HIVE_CONFIG_SCRIPT% %*
-)
-
-set SERVICE=
-set HELP=
-set CATSERVICE=
-set DEBUG=
-set CURRENTARG=
-set HIVEARGS=
-rem set AUX_CLASSPATH=
-set AUX_PARAM=
-
-@rem parse the command line arguments
-:ProcessCmdLine
- if [%1]==[] goto :FinishArgs
-
- set temp=%1
- set temp=%temp:~0, 7%
-
- if %temp%==--debug (
- set DEBUG=%*
- shift
- goto :ProcessCmdLine
- )
-
- if %1==--config (
- shift
- shift
- goto :ProcessCmdLine
- )
-
- if %1==--auxpath (
- shift
- shift
- goto :ProcessCmdLine
- )
-
- if %1==--service (
- set SERVICE=%2
-
- if [%3]==[catservicexml] (
- set CATSERVICE=_catservice
- shift
- )
- shift
- shift
- goto :ProcessCmdLine
- )
-
- if %1==--rcfilecat (
- set SERVICE=rcfilecat
- shift
- goto :ProcessCmdLine
- )
-
- if %1==--orcfiledump (
- set SERVICE=orcfiledump
- shift
- goto :ProcessCmdLine
- )
-
- if %1==--help (
- set HELP=_help
- shift
- goto :ProcessCmdLine
- )
-
- @rem parameter at %1 does not match any option, these are optional params
- goto :FinishArgs
-:FinishArgs
-
-if defined DEBUG (
- if defined HELP (
- call %HIVE_BIN_PATH%\ext\debug.cmd HELP
- goto :EOF
- )
-
- call %HIVE_BIN_PATH%\ext\debug.cmd %DEBUG%
-)
-
-if defined HIVE_MAIN_CLIENT_DEBUG_OPTS (
- set HADOOP_OPTS=%HADOOP_OPTS% %HADOOP_CLIENT_OPTS% %HIVE_MAIN_CLIENT_DEBUG_OPTS%
-)
-
-if not [%1]==[] (
- set CURRENTARG=%1
- call :MakeHiveArgs %*
-)
-
-if not defined SERVICE (
- if defined HELP (
- set SERVICE=help
- ) else (
- set SERVICE=cli
- )
-)
-
-if not defined HIVE_HOME (
- echo "HIVE_HOME needs to be defined to point at the root of the hive install"
- exit /b 1
-)
-
-if not defined HIVE_CONF_DIR (
- set HIVE_CONF_DIR=%HIVE_HOME%\conf
-)
-
-if exist %HIVE_CONF_DIR%/hive-env.cmd CALL %HIVE_CONF_DIR%/hive-env.cmd
-
-@rem sort out classpath and make sure dependencies exist
-set CLASSPATH=%HIVE_CONF_DIR%
-
-set HIVE_LIB=%HIVE_HOME%\lib
-
-@rem needed for execution
-if not exist %HIVE_LIB%\hive-exec-*.jar (
- echo "Missing Hive Execution Jar: %HIVE_LIB%/hive-exec-*.jar"
- exit /b 1
-)
-
-if not exist %HIVE_LIB%\hive-metastore-*.jar (
- echo "Missing Hive MetaStore Jar"
- exit /b 1
-)
-
-@rem cli specific code
-if not exist %HIVE_LIB%\hive-cli-*.jar (
- echo "Missing Hive CLI Jar"
- exit /b 1
-)
-
-set CLASSPATH=%CLASSPATH%;%HIVE_LIB%\*;%HIVE_HOME%\hcatalog\share\hcatalog\*;
-
-@rem maybe we should just make users set HADOOP_HOME env variable as a prereq
-@rem in the next iteration, use "where" command to find directory of hadoop install from path
-if not defined HADOOP_HOME (
- echo "HADOOP_HOME needs to be defined to point at the hadoop installation"
- exit /b 1
-)
-
-@rem supress the HADOOP_HOME warnings in 1.x.x
-set HADOOP_HOME_WARN_SUPPRESS=true
-
-set HADOOP=%HADOOP_HOME%\bin\hadoop.cmd
-if not exist %HADOOP% (
- echo "Missing hadoop installation: %HADOOP_HOME% must be set"
- exit /b 1
-)
-
-@rem can only run against hadoop 1.0.0 as prereq for this iteration - can't figure out the regex/awk script to determine compatibility
-
-@rem add auxilary jars such as serdes
-if not defined HIVE_AUX_JARS_PATH goto :AddAuxLibDir
-
-setLocal EnableDelayedExpansion
-:auxJarLoop
- for /f "delims=," %%a in ("!HIVE_AUX_JARS_PATH!") do (
- set auxjar=%%a
- if exist %%a (
- if exist "%%a\nul" (
- @rem %%a is a dir
- pushd %%a
- for /f %%b IN ('dir /b *.jar') do (
- set AUX_CLASSPATH=!AUX_CLASSPATH!;%%a\%%b
- call :AddToAuxParam %%a\%%b
- )
- popd
- ) else (
- @rem %%a is a file
- set AUX_CLASSPATH=!AUX_CLASSPATH!;%%a
- call :AddToAuxParam %%a
- )
- )
- )
- :striploop
- set stripchar=!HIVE_AUX_JARS_PATH:~0,1!
- set HIVE_AUX_JARS_PATH=!HIVE_AUX_JARS_PATH:~1!
- if "!HIVE_AUX_JARS_PATH!" EQU "" goto auxJarLoopEnd
- if "!stripchar!" NEQ "," goto striploop
- goto auxJarLoop
-
-:auxJarLoopEnd
-
-if defined HIVE_AUX_JARS_PATH (
- echo "setting aux param %HIVE_AUX_JARS_PATH%"
- set AUX_CLASSPATH=%HIVE_AUX_JARS_PATH%
- set AUX_PARAM=file://%HIVE_AUX_JARS_PATH%
-)
-
-
-:AddAuxLibDir
-@rem adding jars from auxlib directory
-if exist %HIVE_HOME%\auxlib (
- pushd %HIVE_HOME%\auxlib
- for /f %%a IN ('dir /b *.jar') do (
- set AUX_CLASSPATH=%AUX_CLASSPATH%;%%a
- call :AddToAuxParam %%a
- )
- popd
-)
-set HADOOP_USER_CLASSPATH_FIRST=true
-
-@rem pass classpath to hadoop
-set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%CLASSPATH%;%AUX_CLASSPATH%
-
-@rem also pass hive classpath to hadoop
-if defined HIVE_CLASSPATH (
- set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%HIVE_CLASSPATH%
-)
-
-@rem set hbase components
-if defined HBASE_HOME (
- if not defined HBASE_CONF_DIR (
- if exist %HBASE_HOME%\conf (
- set HBASE_CONF_DIR=%HBASE_HOME%\conf
- )
- )
- if defined HBASE_CONF_DIR (
- call :AddToHadoopClassPath %HBASE_CONF_DIR%
- )
- if exist %HBASE_HOME%\lib (
- call :AddToHadoopClassPath %HBASE_HOME%\lib\*
- )
-)
-
-if defined AUX_PARAM (
- set HIVE_OPTS=%HIVE_OPTS% -hiveconf hive.aux.jars.path="%AUX_PARAM%"
- set AUX_JARS_CMD_LINE="-libjars %AUX_PARAM%"
-)
-
-@rem Get ready to run the services
-set SERVICE_COUNT=0
-set TORUN=""
-call :AddServices
-For /L %%i in (1,1,%SERVICE_COUNT%) do (
- if "%SERVICE%" == "!VAR%%i!" (
- set TORUN=!VAR%%i!
- )
-)
-
-if %TORUN% == "" (
- echo "Service %SERVICE% not available"
- exit /b 1
-)
-
-
-if defined HELP (
- call %HIVE_BIN_PATH%\ext\%TORUN%.cmd %TORUN%%HELP% %*
- goto :EOF
-)
-
-@rem generate xml for the service, also append hadoop dependencies to the classpath
-if defined CATSERVICE (
- if exist %HADOOP_HOME%\libexec\hadoop-config.cmd (
- call %HADOOP_HOME%\libexec\hadoop-config.cmd
- ) else (
- call %HADOOP_HOME%\libexec\hadoop-config.cmd
- )
- call %HIVE_BIN_PATH%\ext\%TORUN%.cmd %TORUN%%CATSERVICE% %*
- goto :EOF
-)
-
-call %HIVE_BIN_PATH%\ext\%TORUN%.cmd %TORUN% %*
-
-
-
-goto :EOF
-@rem done body of script
-
-
-@rem start utility functions here
-
-@rem strip off preceding arguments like --service so that subsequent args can be passed on
-:MakeHiveArgs
- set _count=0
- set _shift=1
- set HIVEARGS=
-
- if not defined CURRENTARG (
- goto :EndLoop
- )
- :HiveArgsLoop
- if [%1]==[] (
- goto :EndLoop
- )
- if not %1==%CURRENTARG% (
- shift
- goto :HiveArgsLoop
- )
-
- if not defined HIVEARGS (
- set HIVEARGS=%1
- ) else (
- set HIVEARGS=%HIVEARGS% %1
- )
- shift
- set CURRENTARG=%1
- goto :HiveArgsLoop
- :EndLoop
-goto :EOF
-
-@rem makes list of available services
-:AddServices
- set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
- set VAR%SERVICE_COUNT%=cli
-
- set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
- 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
- set VAR%SERVICE_COUNT%=jar
-
- set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
- set VAR%SERVICE_COUNT%=lineage
-
- set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
- set VAR%SERVICE_COUNT%=metastore
-
- set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
- set VAR%SERVICE_COUNT%=rcfilecat
-
- set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
- set VAR%SERVICE_COUNT%=orcfiledump
-
- set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
- set VAR%SERVICE_COUNT%=schematool
-
- set /a SERVICE_COUNT = %SERVICE_COUNT% + 1
- set VAR%SERVICE_COUNT%=cleardanglingscratchdir
-goto :EOF
-
-:AddToAuxParam
-if not defined AUX_PARAM (
- set AUX_PARAM=file:///%1
- ) else (
- set AUX_PARAM=%AUX_PARAM%,file:///%1
- )
-)
-goto :EOF
-
-:AddToHadoopClassPath
-if defined HADOOP_CLASSPATH (
- set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%1
-) else (
- set HADOOP_CLASSPATH=%1
- )
-)
-goto :EOF
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/bin/hplsql.cmd
----------------------------------------------------------------------
diff --git a/bin/hplsql.cmd b/bin/hplsql.cmd
deleted file mode 100644
index 6717a1c..0000000
--- a/bin/hplsql.cmd
+++ /dev/null
@@ -1,58 +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.
-SetLocal EnableDelayedExpansion
-
-pushd %CD%\..
-if not defined HIVE_HOME (
- set HIVE_HOME=%CD%
-)
-popd
-
-if "%HADOOP_BIN_PATH:~-1%" == "\" (
- set HADOOP_BIN_PATH=%HADOOP_BIN_PATH:~0,-1%
-)
-
-if not defined JAVA_HOME (
- echo Error: JAVA_HOME is not set.
- goto :eof
-)
-
-@rem get the hadoop envrionment
-if not exist %HADOOP_HOME%\libexec\hadoop-config.cmd (
- @echo +================================================================+
- @echo ^| Error: HADOOP_HOME is not set correctly ^|
- @echo +----------------------------------------------------------------+
- @echo ^| Please set your HADOOP_HOME variable to the absolute path of ^|
- @echo ^| the directory that contains \libexec\hadoop-config.cmd ^|
- @echo +================================================================+
- exit /b 1
-)
-@rem supress the HADOOP_HOME warnings in 1.x.x
-set HADOOP_HOME_WARN_SUPPRESS=true
-
-@rem include only the HPL/SQL jar and its dependencies
-pushd %HIVE_HOME%\lib
-for /f %%a IN ('dir /b hive-hplsql-**.jar') do (
- set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%HIVE_HOME%\lib\%%a
-)
-set HADOOP_CLASSPATH=%HADOOP_CLASSPATH%;%HIVE_HOME%\lib\antlr-runtime-4.5.jar
-popd
-set HADOOP_USER_CLASSPATH_FIRST=true
-call %HADOOP_HOME%\libexec\hadoop-config.cmd
-
-call "%JAVA_HOME%\bin\java" %JAVA_HEAP_MAX% %HADOOP_OPTS% -classpath %HADOOP_CLASSPATH% org.apache.hive.hplsql.Hplsql %*
-
-endlocal
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
----------------------------------------------------------------------
diff --git a/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java b/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
index bb1d865..bf23ba3 100644
--- a/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
+++ b/cli/src/test/org/apache/hadoop/hive/cli/TestCliDriverMethods.java
@@ -316,13 +316,6 @@ public class TestCliDriverMethods extends TestCase {
}
private static void setEnv(String key, String value) throws Exception {
- if (Shell.WINDOWS)
- setEnvWindows(key, value);
- else
- setEnvLinux(key, value);
- }
-
- private static void setEnvLinux(String key, String value) throws Exception {
Class[] classes = Collections.class.getDeclaredClasses();
Map<String, String> env = System.getenv();
for (Class cl : classes) {
@@ -340,27 +333,6 @@ public class TestCliDriverMethods extends TestCase {
}
}
- private static void setEnvWindows(String key, String value) throws Exception {
- Class<?> processEnvironmentClass = Class.forName("java.lang.ProcessEnvironment");
- Field theEnvironmentField = processEnvironmentClass.getDeclaredField("theEnvironment");
- theEnvironmentField.setAccessible(true);
- Map<String, String> env = (Map<String, String>) theEnvironmentField.get(null);
- if (value == null) {
- env.remove(key);
- } else {
- env.put(key, value);
- }
-
- Field theCaseInsensitiveEnvironmentField = processEnvironmentClass.getDeclaredField("theCaseInsensitiveEnvironment");
- theCaseInsensitiveEnvironmentField.setAccessible(true);
- Map<String, String> cienv = (Map<String, String>) theCaseInsensitiveEnvironmentField.get(null);
- if (value == null) {
- cienv.remove(key);
- } else {
- cienv.put(key, value);
- }
- }
-
private static class FakeCliDriver extends CliDriver {
@Override
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/common/FileUtils.java b/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
index ab3439c..9e07c08 100644
--- a/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
+++ b/common/src/java/org/apache/hadoop/hive/common/FileUtils.java
@@ -240,15 +240,6 @@ public final class FileUtils {
for (char c : clist) {
charToEscape.set(c);
}
-
- if(Shell.WINDOWS){
- //On windows, following chars need to be escaped as well
- char [] winClist = {' ', '<','>','|'};
- for (char c : winClist) {
- charToEscape.set(c);
- }
- }
-
}
static boolean needsEscaping(char c) {
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
index b27b663..0e4f1f6 100644
--- a/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
+++ b/common/src/java/org/apache/hadoop/hive/conf/HiveConf.java
@@ -3469,13 +3469,13 @@ public class HiveConf extends Configuration {
val = (val == null ? File.separator + "usr" : val)
+ File.separator + "bin" + File.separator + "hadoop";
// Launch hadoop command file on windows.
- return val + (Shell.WINDOWS ? ".cmd" : "");
+ return val;
}
private static String findYarnBinary() {
String val = findHadoopHome();
val = (val == null ? "yarn" : val + File.separator + "bin" + File.separator + "yarn");
- return val + (Shell.WINDOWS ? ".cmd" : "");
+ return val;
}
private static String findHadoopHome() {
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/common/src/java/org/apache/hive/http/HttpServer.java
----------------------------------------------------------------------
diff --git a/common/src/java/org/apache/hive/http/HttpServer.java b/common/src/java/org/apache/hive/http/HttpServer.java
index f99f18a..db5650d 100644
--- a/common/src/java/org/apache/hive/http/HttpServer.java
+++ b/common/src/java/org/apache/hive/http/HttpServer.java
@@ -365,7 +365,7 @@ public class HttpServer {
connector.setResolveNames(false);
connector.setUseDirectBuffers(false);
connector.setRequestHeaderSize(1024*64);
- connector.setReuseAddress(!Shell.WINDOWS);
+ connector.setReuseAddress(true);
return connector;
}
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
----------------------------------------------------------------------
diff --git a/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java b/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
index 7f6175b..fa51ef6 100644
--- a/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
+++ b/common/src/test/org/apache/hadoop/hive/conf/TestHiveConf.java
@@ -41,11 +41,6 @@ public class TestHiveConf {
public void testHiveSitePath() throws Exception {
String expectedPath = HiveTestUtils.getFileFromClasspath("hive-site.xml");
String hiveSiteLocation = HiveConf.getHiveSiteLocation().getPath();
- if (Shell.WINDOWS) {
- // Do case-insensitive comparison on Windows, as drive letter can have different case.
- expectedPath = expectedPath.toLowerCase();
- hiveSiteLocation = hiveSiteLocation.toLowerCase();
- }
Assert.assertEquals(expectedPath, hiveSiteLocation);
}
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/contrib/src/test/org/apache/hadoop/hive/contrib/mr/TestGenericMR.java
----------------------------------------------------------------------
diff --git a/contrib/src/test/org/apache/hadoop/hive/contrib/mr/TestGenericMR.java b/contrib/src/test/org/apache/hadoop/hive/contrib/mr/TestGenericMR.java
index 5fedb3d..2d8a5e8 100644
--- a/contrib/src/test/org/apache/hadoop/hive/contrib/mr/TestGenericMR.java
+++ b/contrib/src/test/org/apache/hadoop/hive/contrib/mr/TestGenericMR.java
@@ -63,7 +63,7 @@ public final class TestGenericMR extends TestCase {
final StringWriter out = new StringWriter();
new GenericMR().map(new StringReader(in), out, identityMapper());
- assertEquals(in + "\n", getOsSpecificOutput(out.toString()));
+ assertEquals(in + "\n", out.toString());
}
public void testKVSplitMap() throws Exception {
@@ -80,7 +80,7 @@ public final class TestGenericMR extends TestCase {
}
});
- assertEquals(expected, getOsSpecificOutput(out.toString()));
+ assertEquals(expected, out.toString());
}
public void testIdentityReduce() throws Exception {
@@ -89,7 +89,7 @@ public final class TestGenericMR extends TestCase {
new GenericMR().reduce(new StringReader(in), out, identityReducer());
- assertEquals(in + "\n", getOsSpecificOutput(out.toString()));
+ assertEquals(in + "\n", out.toString());
}
public void testWordCountReduce() throws Exception {
@@ -112,7 +112,7 @@ public final class TestGenericMR extends TestCase {
final String expected = "hello\t3\nokay\t12\n";
- assertEquals(expected, getOsSpecificOutput(out.toString()));
+ assertEquals(expected, out.toString());
}
private Mapper identityMapper() {
@@ -135,9 +135,4 @@ public final class TestGenericMR extends TestCase {
}
};
}
-
- private static String getOsSpecificOutput(String outStr){
- assert outStr != null;
- return Shell.WINDOWS ? outStr.replaceAll("\\r", "") : outStr;
- }
}
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/hcatalog/bin/templeton.cmd
----------------------------------------------------------------------
diff --git a/hcatalog/bin/templeton.cmd b/hcatalog/bin/templeton.cmd
deleted file mode 100644
index 1b1ae6f..0000000
--- a/hcatalog/bin/templeton.cmd
+++ /dev/null
@@ -1,90 +0,0 @@
-@rem Licensed to the Apache Software Foundation (ASF) under one
-@rem or more contributor license agreements. See the NOTICE file
-@rem distributed with this work for additional information
-@rem regarding copyright ownership. The ASF licenses this file
-@rem to you under the Apache License, Version 2.0 (the
-@rem "License"); you may not use this file except in compliance
-@rem with 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,
-@rem software distributed under the License is distributed on an
-@rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@rem KIND, either express or implied. See the License for the
-@rem specific language governing permissions and limitations
-@rem under the License.
-@echo off
-
-setlocal enabledelayedexpansion
-
-:main
- if "%1" == "--service" (
- set service_entry=true
- shift
- set templeton-service-name=%1
- if not defined templeton-service-name (
- goto print_usage
- )
- )
-
- @rem Init hadoop env variables (CLASSPATH, HADOOP_OPTS, etc)
- @rem deal with difference in the location of hadoop-config.cmd
- set HADOOP_OPTS=
- if exist %HADOOP_HOME%\libexec\hadoop-config.cmd (
- call %HADOOP_HOME%\libexec\hadoop-config.cmd
- ) else (
- call %HADOOP_HOME%\bin\hadoop-config.cmd
- )
-
- @rem
- @rem Compute the classpath
- @rem
- set WEBHCAT_CONF_DIR=%HCATALOG_HOME%\etc\webhcat
- set TEMPLETON_CLASSPATH=%WEBHCAT_CONF_DIR%;%HCATALOG_HOME%;%HCATALOG_HOME%\share\webhcat\svr
-
- set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\hcatalog\*
- set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\webhcat\svr\*
- set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HCATALOG_HOME%\share\webhcat\svr\lib\*
- set TEMPLETON_CLASSPATH=!TEMPLETON_CLASSPATH!;%HIVE_HOME%\conf
-
- @rem TODO: append hcat classpath to the templeton classpath
- @rem append hadoop classpath
- set CLASSPATH=%TEMPLETON_CLASSPATH%;!CLASSPATH!
-
- @rem compute templeton ops
- if not defined TEMPLETON_LOG_DIR (
- set TEMPLETON_LOG_DIR=%HCATALOG_HOME%\logs
- )
-
- if not defined TEMPLETON_LOG4J (
- @rem must be prefixed with file: otherwise config is not picked up
- set TEMPLETON_LOG4J=file:%WEBHCAT_CONF_DIR%\webhcat-log4j2.properties
- )
- set TEMPLETON_OPTS=-Dtempleton.log.dir=%TEMPLETON_LOG_DIR% -Dlog4j.configurationFile=%TEMPLETON_LOG4J% %HADOOP_OPTS%
- set arguments=%JAVA_HEAP_MAX% %TEMPLETON_OPTS% -classpath %CLASSPATH% org.apache.hive.hcatalog.templeton.Main
-
- if defined service_entry (
- call :makeServiceXml %arguments%
- ) else (
- call %JAVA% %arguments%
- )
-
-goto :eof
-
-:makeServiceXml
- set arguments=%*
- @echo ^<service^>
- @echo ^<id^>%templeton-service-name%^</id^>
- @echo ^<name^>%templeton-service-name%^</name^>
- @echo ^<description^>This service runs Apache Templeton^</description^>
- @echo ^<executable^>%JAVA%^</executable^>
- @echo ^<arguments^>%arguments%^</arguments^>
- @echo ^</service^>
- goto :eof
-
- :print_usage
- @echo Usage: templeton --service SERVICENAME
- @echo where SERVICENAME is name of the windows service xml
-
-endlocal
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
----------------------------------------------------------------------
diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
index 506d3f4..6cc0a96 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatBaseTest.java
@@ -24,7 +24,6 @@ import org.apache.hadoop.hive.cli.CliSessionState;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.HiveMetaStoreClient;
import org.apache.hadoop.hive.ql.Driver;
-import org.apache.hadoop.hive.ql.WindowsPathUtil;
import org.apache.hadoop.hive.ql.session.SessionState;
import org.apache.hadoop.util.Shell;
import org.apache.hive.hcatalog.common.HCatUtil;
@@ -88,9 +87,6 @@ public class HCatBaseTest {
hiveConf
.setVar(HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER,
"org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory");
- if (Shell.WINDOWS) {
- WindowsPathUtil.convertPathsFromWindowsToHdfs(hiveConf);
- }
}
protected void logAndRegister(PigServer server, String query) throws IOException {
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
----------------------------------------------------------------------
diff --git a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
index 1823f2e..69874bc 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
@@ -160,13 +160,10 @@ public class TestHCatPartitionPublish {
Assert.assertEquals(0, ptns.size());
Table table = msc.getTable(dbName, tableName);
Assert.assertTrue(table != null);
- // In Windows, we cannot remove the output directory when job fail. See
- // FileOutputCommitterContainer.abortJob
- if (!Shell.WINDOWS) {
- Path path = new Path(table.getSd().getLocation()
- + "/part1=p1value1/part0=p0value1");
- Assert.assertFalse(path.getFileSystem(conf).exists(path));
- }
+
+ Path path = new Path(table.getSd().getLocation()
+ + "/part1=p1value1/part0=p0value1");
+ Assert.assertFalse(path.getFileSystem(conf).exists(path));
}
void runMRCreateFail(
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderComplexSchema.java
----------------------------------------------------------------------
diff --git a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderComplexSchema.java b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderComplexSchema.java
index 0b5e83e..4c686fe 100644
--- a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderComplexSchema.java
+++ b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderComplexSchema.java
@@ -33,7 +33,6 @@ import org.apache.hadoop.hive.cli.CliSessionState;
import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.ql.CommandNeedRetryException;
import org.apache.hadoop.hive.ql.Driver;
-import org.apache.hadoop.hive.ql.WindowsPathUtil;
import org.apache.hadoop.hive.ql.io.IOConstants;
import org.apache.hadoop.hive.ql.io.StorageFormats;
import org.apache.hadoop.hive.ql.processors.CommandProcessorResponse;
@@ -129,10 +128,6 @@ public class TestHCatLoaderComplexSchema {
.setVar(HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER,
"org.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory");
- if (Shell.WINDOWS) {
- WindowsPathUtil.convertPathsFromWindowsToHdfs(hiveConf);
- }
-
driver = new Driver(hiveConf);
SessionState.start(new CliSessionState(hiveConf));
//props = new Properties();
http://git-wip-us.apache.org/repos/asf/hive/blob/38ad7792/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java
----------------------------------------------------------------------
diff --git a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java
index 717cbad..ad11eab 100644
--- a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java
+++ b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestHCatLoaderEncryption.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.hive.conf.HiveConf;
import org.apache.hadoop.hive.metastore.MetaStoreUtils;
import org.apache.hadoop.hive.ql.CommandNeedRetryException;
import org.apache.hadoop.hive.ql.Driver;
-import org.apache.hadoop.hive.ql.WindowsPathUtil;
import org.apache.hadoop.hive.ql.io.IOConstants;
import org.apache.hadoop.hive.ql.io.StorageFormats;
import org.apache.hadoop.hive.ql.processors.CommandProcessor;
@@ -187,9 +186,6 @@ public class TestHCatLoaderEncryption {
System.getProperty("test.build.data", "build/test/data") + "_" + System.currentTimeMillis() +
"_" + salt.getAndIncrement() + "/dfs/");
}
- if (Shell.WINDOWS) {
- WindowsPathUtil.convertPathsFromWindowsToHdfs(hiveConf);
- }
driver = new Driver(hiveConf);
@@ -201,9 +197,9 @@ public class TestHCatLoaderEncryption {
createTable(BASIC_TABLE, "a int, b string");
createTableInSpecifiedPath(ENCRYPTED_TABLE, "a int, b string",
- WindowsPathUtil.getHdfsUriString(encryptedTablePath), driver);
+ encryptedTablePath, driver);
- associateEncryptionZoneWithPath(WindowsPathUtil.getHdfsUriString(encryptedTablePath));
+ associateEncryptionZoneWithPath(encryptedTablePath);
int LOOP_SIZE = 3;
String[] input = new String[LOOP_SIZE * LOOP_SIZE];
@@ -231,7 +227,6 @@ public class TestHCatLoaderEncryption {
FileSystem fs;
HadoopShims shims = ShimLoader.getHadoopShims();
conf.set(SECURITY_KEY_PROVIDER_URI_NAME, getKeyProviderURI());
- WindowsPathUtil.convertPathsFromWindowsToHdfs(conf);
int numberOfDataNodes = 4;
dfs = shims.getMiniDfs(conf, numberOfDataNodes, true, null);
fs = dfs.getFileSystem();
@@ -359,7 +354,7 @@ public class TestHCatLoaderEncryption {
fs.delete(path, true);
}
- TextOutputFormat.setOutputPath(job, new Path(WindowsPathUtil.getHdfsUriString(pathLoc)));
+ TextOutputFormat.setOutputPath(job, new Path(pathLoc));
job.waitForCompletion(true);