hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jd...@apache.org
Subject [12/20] hive git commit: HIVE-13440 : remove hiveserver1 scripts and thrift generated files (Balint Molnar via Thejas Nair)
Date Thu, 28 Apr 2016 22:15:30 GMT
HIVE-13440 : remove hiveserver1 scripts and thrift generated files (Balint Molnar via Thejas
Nair)


Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/6a4e0806
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/6a4e0806
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/6a4e0806

Branch: refs/heads/llap
Commit: 6a4e0806a81bbdae56f63d355a18e434767cf9b9
Parents: 815499a
Author: Balint Molnar <bmolnar@hortonworks.com>
Authored: Wed Apr 27 15:10:24 2016 -0700
Committer: Thejas Nair <thejas@hortonworks.com>
Committed: Wed Apr 27 15:15:23 2016 -0700

----------------------------------------------------------------------
 bin/ext/hiveserver.cmd                          |   48 -
 bin/ext/hiveserver.sh                           |   35 -
 service/if/hive_service.thrift                  |   86 -
 service/src/gen/thrift/gen-cpp/ThriftHive.cpp   | 3544 --------
 service/src/gen/thrift/gen-cpp/ThriftHive.h     | 1224 ---
 .../gen-cpp/ThriftHive_server.skeleton.cpp      |   84 -
 .../thrift/gen-cpp/hive_service_constants.cpp   |   17 -
 .../gen/thrift/gen-cpp/hive_service_constants.h |   24 -
 .../gen/thrift/gen-cpp/hive_service_types.cpp   |  351 -
 .../src/gen/thrift/gen-cpp/hive_service_types.h |  176 -
 .../hadoop/hive/service/HiveClusterStatus.java  |  901 --
 .../hive/service/HiveServerException.java       |  601 --
 .../hadoop/hive/service/JobTrackerState.java    |   45 -
 .../apache/hadoop/hive/service/ThriftHive.java  | 7784 ------------------
 service/src/gen/thrift/gen-php/ThriftHive.php   | 1943 -----
 service/src/gen/thrift/gen-php/Types.php        |  338 -
 .../gen-py/hive_service/ThriftHive-remote       | 1263 ---
 .../thrift/gen-py/hive_service/ThriftHive.py    | 1674 ----
 .../gen/thrift/gen-py/hive_service/__init__.py  |    1 -
 .../gen/thrift/gen-py/hive_service/constants.py |   11 -
 .../gen/thrift/gen-py/hive_service/ttypes.py    |  260 -
 .../gen/thrift/gen-rb/hive_service_constants.rb |    9 -
 .../src/gen/thrift/gen-rb/hive_service_types.rb |   68 -
 service/src/gen/thrift/gen-rb/thrift_hive.rb    |  555 --
 24 files changed, 21042 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/6a4e0806/bin/ext/hiveserver.cmd
----------------------------------------------------------------------
diff --git a/bin/ext/hiveserver.cmd b/bin/ext/hiveserver.cmd
deleted file mode 100644
index 1f0e717..0000000
--- a/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 ^<service^>
-@echo   ^<id^>HiveServer^</id^>
-@echo   ^<name^>HiveServer^</name^>
-@echo   ^<description^>Hadoop HiveServer Service^</description^>
-@echo   ^<executable^>%JAVA_HOME%\bin\java^</executable^>
-@echo   ^<arguments^>%JAVA_HEAP_MAX% %HADOOP_OPTS% %AUX_PARAM% -classpath %CLASSPATH%
%CLASS% -hiveconf hive.hadoop.classpath=%HIVE_LIB%\* %HIVE_OPTS%^</arguments^>
-@echo ^</service^>
-goto :EOF

http://git-wip-us.apache.org/repos/asf/hive/blob/6a4e0806/bin/ext/hiveserver.sh
----------------------------------------------------------------------
diff --git a/bin/ext/hiveserver.sh b/bin/ext/hiveserver.sh
deleted file mode 100644
index 7335b83..0000000
--- a/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
-}
-

http://git-wip-us.apache.org/repos/asf/hive/blob/6a4e0806/service/if/hive_service.thrift
----------------------------------------------------------------------
diff --git a/service/if/hive_service.thrift b/service/if/hive_service.thrift
deleted file mode 100644
index 8f007bc..0000000
--- a/service/if/hive_service.thrift
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/local/bin/thrift -java
-
-# 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.
-
-#
-# Thrift Service that the hive service is built on
-#
-
-#
-# TODO: include/thrift is shared among different components. It
-# should not be under metastore.
-
-include "share/fb303/if/fb303.thrift"
-include "metastore/if/hive_metastore.thrift"
-include "ql/if/queryplan.thrift"
-
-namespace java org.apache.hadoop.hive.service
-namespace cpp Apache.Hadoop.Hive
-
-// Enumeration of JobTracker.State                                                      
               
-enum JobTrackerState {                                                                  

-  INITIALIZING   = 1,           
-  RUNNING        = 2,                                                      
-}  
-
-// Map-Reduce cluster status information
-struct HiveClusterStatus {
-  1: i32              taskTrackers,
-  2: i32              mapTasks,
-  3: i32              reduceTasks,
-  4: i32              maxMapTasks,
-  5: i32              maxReduceTasks,
-  6: JobTrackerState  state,
-}
-
-exception HiveServerException {
-  1: string message
-  2: i32 errorCode
-  3: string SQLState
-}
-
-# Interface for Thrift Hive Server
-service ThriftHive extends hive_metastore.ThriftHiveMetastore {
-  # Execute a query. Takes a HiveQL string
-  void execute(1:string query) throws(1:HiveServerException ex)
-
-  # Fetch one row. This row is the serialized form
-  # of the result of the query
-  string fetchOne() throws(1:HiveServerException ex)
-
-  # Fetch a given number of rows or remaining number of
-  # rows whichever is smaller.
-  list<string> fetchN(1:i32 numRows) throws(1:HiveServerException ex)
-
-  # Fetch all rows of the query result
-  list<string> fetchAll() throws(1:HiveServerException ex)
-
-  # Get a schema object with fields represented with native Hive types
-  hive_metastore.Schema getSchema() throws(1:HiveServerException ex)
-
-  # Get a schema object with fields represented with Thrift DDL types
-  hive_metastore.Schema getThriftSchema() throws(1:HiveServerException ex)
-  
-  # Get the status information about the Map-Reduce cluster
-  HiveClusterStatus getClusterStatus() throws(1:HiveServerException ex)
-  
-  # Get the queryplan annotated with counter information
-  queryplan.QueryPlan getQueryPlan() throws(1:HiveServerException ex)
-
-  # clean up last Hive query (releasing locks etc.)
-  void clean()
-}


Mime
View raw message