You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2011/11/03 00:40:26 UTC
svn commit: r1196868 [1/4] - in /incubator/bigtop/branches/hadoop-0.22: ./
bigtop-deploy/puppet/manifests/
bigtop-deploy/puppet/modules/hadoop/manifests/
bigtop-deploy/puppet/modules/kerberos/manifests/
bigtop-packages/src/common/hive/ bigtop-packages/...
Author: rvs
Date: Wed Nov 2 23:40:24 2011
New Revision: 1196868
URL: http://svn.apache.org/viewvc?rev=1196868&view=rev
Log:
Merging in 0.2.0 RC0
Added:
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierHive.groovy
- copied, changed from r1196225, incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierFlume.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributedWithRM.groovy
- copied, changed from r1196225, incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesReadiness.groovy
Removed:
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hive/hadoop-hive.sh.suse
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesReadiness.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesSingleNode.groovy
Modified:
incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/manifests/site.pp
incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hive/hadoop-hive.sh
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hive/service-init.d.tpl
incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hive/SPECS/hive.spec
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/src/main/groovy/org/apache/bigtop/itest/flumesmoke/TestFlumeSmoke.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadooptests/TestTestCLI.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBaseCompression.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBasePigSmoke.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHFileOutputFormat.java
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/in
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/out
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/src/main/groovy/org/apache/bigtop/itest/ooziesmoke/TestOozieSmoke.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/pom.xml
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/CDHServices.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/DeployCDH.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestCommon.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/PackageTestRepoMgr.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierFlume.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierHBase.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierHDFS.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierHue.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/StateVerifierMapreduce.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesBasics.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestPackagesPseudoDistributed.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/groovy/org/apache/bigtop/itest/packagesmoke/TestServices.groovy
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/package/src/main/resources/package_data_yum.xml
incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-execution/smokes/hive/pom.xml
incubator/bigtop/branches/hadoop-0.22/bigtop.mk
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/manifests/site.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/manifests/site.pp?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/manifests/site.pp (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/manifests/site.pp Wed Nov 2 23:40:24 2011
@@ -16,7 +16,7 @@
stage {"pre": before => Stage["main"]}
yumrepo { "Bigtop":
- baseurl => "http://bigtop01.cloudera.org:8080/job/Bigtop-trunk-centos5/lastSuccessfulBuild/artifact/output/",
+ baseurl => "http://bigtop01.cloudera.org:8080/job/Bigtop-trunk-matrix/label=centos5/lastSuccessfulBuild/artifact/output/",
descr => "Bigtop packages",
enabled => 1,
gpgcheck => 0,
@@ -33,8 +33,10 @@ import "cluster.pp"
node default {
if ($hadoop_head_node == $fqdn) {
- include hadoop_head_node
+ include hadoop_gateway_node
} else {
include hadoop_worker_node
}
}
+
+Yumrepo<||> -> Package<||>
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp Wed Nov 2 23:40:24 2011
@@ -23,26 +23,31 @@ class hadoop {
file {
"/etc/hadoop/conf/core-site.xml":
content => template('hadoop/core-site.xml'),
+ require => [Package["hadoop"]],
}
file {
"/etc/hadoop/conf/mapred-site.xml":
content => template('hadoop/mapred-site.xml'),
+ require => [Package["hadoop"]],
}
file {
"/etc/hadoop/conf/hdfs-site.xml":
content => template('hadoop/hdfs-site.xml'),
+ require => [Package["hadoop"]],
}
file {
"/etc/hadoop/conf/hadoop-env.sh":
content => template('hadoop/hadoop-env.sh'),
+ require => [Package["hadoop"]],
}
file {
"/etc/default/hadoop":
content => template('hadoop/hadoop'),
+ require => [Package["hadoop"]],
}
package { "hadoop":
@@ -51,7 +56,7 @@ class hadoop {
package { "hadoop-native":
ensure => latest,
- require => [Package["hadoop"], Yumrepo["Bigtop"]],
+ require => [Package["hadoop"]],
}
}
@@ -73,7 +78,7 @@ class hadoop {
if ($hadoop_security_authentication == "kerberos") {
package { "hadoop-sbin":
ensure => latest,
- require => [Package["hadoop"], Yumrepo["Bigtop"]],
+ require => [Package["hadoop"]],
}
}
@@ -82,7 +87,7 @@ class hadoop {
hasstatus => true,
subscribe => [Package["hadoop-datanode"], File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/hdfs-site.xml"], File["/etc/hadoop/conf/hadoop-env.sh"]],
require => [ Package["hadoop-datanode"] ],
- } -> file { $dirs:
+ } <- file { $dirs:
ensure => directory,
owner => hdfs,
group => hdfs,
@@ -124,18 +129,19 @@ class hadoop {
hasstatus => true,
subscribe => [Package["hadoop-namenode"], File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/hadoop-env.sh"]],
require => [Package["hadoop-namenode"], Exec["namenode format"]],
- } -> file { $dirs:
- ensure => directory,
- owner => hdfs,
- group => hdfs,
- mode => 700,
- }
+ }
exec { "namenode format":
user => "hdfs",
- command => "/bin/bash -c 'yes Y | hadoop namenode -format'",
+ command => "/bin/bash -c 'yes Y | hadoop namenode -format >> /tmp/nn.format.log 2>&1'",
creates => inline_template("<%= hadoop_storage_locations.split(';')[0] %>/namenode/image"),
require => [Package["hadoop-namenode"]],
+ } <- file { $dirs:
+ ensure => directory,
+ owner => hdfs,
+ group => hdfs,
+ mode => 700,
+ require => [Package["hadoop"]],
}
}
@@ -161,7 +167,7 @@ class hadoop {
hasstatus => true,
subscribe => [Package["hadoop-jobtracker"], File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/mapred-site.xml"], File["/etc/hadoop/conf/hadoop-env.sh"]],
require => [ Package["hadoop-jobtracker"] ]
- } -> file { $dirs:
+ } <- file { $dirs:
ensure => directory,
owner => mapred,
group => mapred,
@@ -195,7 +201,7 @@ class hadoop {
hasstatus => true,
subscribe => [Package["hadoop-tasktracker"], File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/mapred-site.xml"], File["/etc/hadoop/conf/hadoop-env.sh"]],
require => [ Package["hadoop-tasktracker"], File["/etc/hadoop/conf/taskcontroller.cfg"] ],
- } -> file { $dirs:
+ } <- file { $dirs:
ensure => directory,
owner => mapred,
group => mapred,
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-deploy/puppet/modules/kerberos/manifests/init.pp Wed Nov 2 23:40:24 2011
@@ -107,7 +107,6 @@ class kerberos {
class admin_server inherits kerberos::kdc {
- /* BUG: KITCHEN-751 */
$se_hack = "setsebool -P kadmind_disable_trans 1 ; setsebool -P krb5kdc_disable_trans 1"
package { "$package_name_admin":
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hive/hadoop-hive.sh
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hive/hadoop-hive.sh?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hive/hadoop-hive.sh (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/common/hive/hadoop-hive.sh Wed Nov 2 23:40:24 2011
@@ -14,22 +14,27 @@
# 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.
-
-# chkconfig: 2345 90 10
-# description:
+#
+#
+#
+# Starts a Hive @HIVE_DAEMON@
+#
+# chkconfig: 345 90 10
+# description: Starts a Hive @HIVE_DAEMON@
# processname: hive
# pidfile: /var/run/hive/hive-@HIVE_DAEMON@.pid
### BEGIN INIT INFO
-# Provides: hive-@HIVE_DAEMON@
-# Required-Start: $network $local_fs
-# Required-Stop:
-# Should-Start: $named
+# Provides: hadoop-hive-@HIVE_DAEMON@
+# Required-Start: $syslog $remote_fs
+# Should-Start:
+# Required-Stop: $syslog $remote_fs
# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: hive
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+# Short-Description: Starts a Hive @HIVE_DAEMON@
### END INIT INFO
+source /lib/lsb/init-functions
# Autodetect JAVA_HOME if not defined
if [ -e /usr/libexec/bigtop-detect-javahome ]; then
@@ -38,126 +43,92 @@ elif [ -e /usr/lib/bigtop-utils/bigtop-d
. /usr/lib/bigtop-utils/bigtop-detect-javahome
fi
-# Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh
+RETVAL_SUCCESS=0
+
+STATUS_RUNNING=0
+STATUS_DEAD=1
+STATUS_DEAD_AND_LOCK=2
+STATUS_NOT_RUNNING=3
+
+ERROR_PROGRAM_NOT_INSTALLED=5
+ERROR_PROGRAM_NOT_CONFIGURED=6
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
SYS_FILE="/etc/default/hadoop-hive-@HIVE_DAEMON@"
EXE_FILE="/usr/lib/hive/bin/hive"
PID_FILE="/var/run/hive/hive-@HIVE_DAEMON@.pid"
+LOCKFILE="/var/lock/subsys/hadoop-hive-@HIVE_DAEMON@"
LOG_FILE="/var/log/hive/hive-@HIVE_DAEMON@.log"
HIVE_USER="hive"
-NICENESS="0"
+HIVE_HOME="`eval echo ~$HIVE_USER`"
+NICENESS="+0"
NAME="hadoop-hive-@HIVE_DAEMON@"
-DESC="Hive daemon"
-
-DODTIME=3
-SLAVE_TIMEOUT=300
+DESC="Hive @HIVE_DAEMON@ daemon"
+TIMEOUT=3
[ -f $SYS_FILE ] && . $SYS_FILE
-hive_die() {
- echo "$@"
- exit 1
-}
-hive_is_process_alive() {
- local pid="$1"
- kill -0 $pid > /dev/null 2>&1
-}
-hive_check_pidfile() {
- local pidfile="$1" # IN
- local pid
-
- pid=`cat "$pidfile" 2>/dev/null`
- if [ "$pid" = '' ]; then
- # The file probably does not exist or is empty.
- return 1
- fi
-
- set -- $pid
- pid="$1"
-
- hive_is_process_alive $pid
-}
-hive_process_kill() {
- local pid="$1" # IN
- local signal="$2" # IN
- local second
-
- kill -$signal $pid 2>/dev/null
-
- for second in 0 1 2 3 4 5 6 7 8 9 10; do
- hive_is_process_alive "$pid" || return 0
- sleep 1
- done
-
- return 1
-}
-hive_stop_pidfile() {
- local pidfile="$1" # IN
- local pid
-
- pid=`cat "$pidfile" 2>/dev/null`
- if [ "$pid" = '' ]; then
- # The file probably does not exist or is empty. Success
- return 0
- fi
-
- set -- $pid
- pid="$1"
-
- # First try the easy way
- if hive_process_kill "$pid" 15; then
- return 0
- fi
-
- # Otherwise try the hard way
- if hive_process_kill "$pid" 9; then
- return 0
- fi
-
- return 1
-}
-
hive_start() {
- if hive_check_pidfile $PID_FILE ; then
- exit 0
- fi
+ [ -x $EXE_FILE ] || exit $ERROR_PROGRAM_NOT_INSTALLED
service_name="@HIVE_DAEMON@"
if [ $service_name = "server" ] ; then
service_name="hiveserver"
exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`\""
fi
- echo starting $EXE_FILE, logging to $LOG_FILE
- su -s /bin/sh $HIVE_USER \
- -c "$exec_env nohup nice -n $NICENESS \
+
+ log_success_msg "Starting $desc (hadoop-hive-@HIVE_DAEMON@): "
+ start_daemon -u $HIVE_USER -p $PID_FILE -n $NICENESS /bin/sh -c "cd $HIVE_HOME ; $exec_env nohup \
$EXE_FILE --service $service_name $PORT \
> $LOG_FILE 2>&1 < /dev/null & "'echo $! '"> $PID_FILE"
- sleep 3
- hive_check_pidfile $PID_FILE || hive_die "failed to start @HIVE_DAEMON@"
+ RETVAL=$?
+ [ $RETVAL -eq $RETVAL_SUCCESS ] && touch $LOCKFILE
+ return $RETVAL
}
+
hive_stop() {
- if [ -f $PID_FILE ]; then
- hive_stop_pidfile $PID_FILE || hive_die "failed to stop metastore"
- rm $PID_FILE
- fi
+ log_success_msg "Stopping $desc (hadoop-hive-@HIVE_DAEMON@): "
+ killproc -p $PID_FILE java
+ RETVAL=$?
+
+ [ $RETVAL -eq $RETVAL_SUCCESS ] && rm -f $LOCKFILE $PID_FILE
+ return $RETVAL
}
+
hive_restart() {
hive_stop
- [ -n "$DODTIME" ] && sleep $DODTIME
+ [ -n "$TIMEOUT" ] && sleep $TIMEOUT
hive_start
}
+
hive_status() {
- echo -n "$NAME is "
- if hive_check_pidfile $PID_FILE ; then
- echo "running"
- else
- echo "not running"
- exit 1
- fi
+ echo -n "Checking for service $desc: "
+ pidofproc -p $PID_FILE java > /dev/null
+ status=$?
+
+ case "$status" in
+ $STATUS_RUNNING)
+ log_success_msg "@HADOOP_DAEMON@ is running"
+ ;;
+ $STATUS_DEAD)
+ log_failure_msg "@HADOOP_DAEMON@ is dead and pid file exists"
+ ;;
+ $STATUS_DEAD_AND_LOCK)
+ log_failure_msg "@HADOOP_DAEMON@ is dead and lock file exists"
+ ;;
+ $STATUS_NOT_RUNNING)
+ log_failure_msg "@HADOOP_DAEMON@ is not running"
+ ;;
+ *)
+ log_failure_msg "@HADOOP_DAEMON@ status is unknown"
+ ;;
+ esac
+ return $status
}
+RETVAL=0
+
case "$1" in
start)
hive_start
@@ -168,7 +139,7 @@ case "$1" in
;;
force-reload|condrestart|try-restart)
- hive_check_pidfile $PID_FILE && hive_restart
+ [ -e $LOCKFILE ] && hive_restart || :
;;
restart|reload)
@@ -186,3 +157,5 @@ case "$1" in
exit 1
;;
esac
+
+exit $RETVAL
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hive/service-init.d.tpl
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hive/service-init.d.tpl?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hive/service-init.d.tpl (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/deb/hive/service-init.d.tpl Wed Nov 2 23:40:24 2011
@@ -23,139 +23,120 @@
# by Ian Murdock <im...@gnu.ai.mit.edu>.
# Further changes by Javier Fernandez-Sanguino <jf...@debian.org>
#
-# Version: @(#)skeleton 1.9 26-Feb-2001 miquels@cistron.nl
+# Starts a Hive @HIVE_DAEMON@
+#
+# chkconfig: 345 85 15
+# description: Starts a Hive @HIVE_DAEMON@
+# processname: hive
#
### BEGIN INIT INFO
-# Provides: hive-@HIVE_DAEMON@
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $remote_fs
-# Should-Start: $named
+# Provides: hadoop-hive-@HIVE_DAEMON@
+# Required-Start: $syslog $remote_fs
+# Should-Start:
+# Required-Stop: $syslog $remote_fs
# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: hive
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+# Short-Description: Starts a Hive @HIVE_DAEMON@
### END INIT INFO
-# Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh
+source /lib/lsb/init-functions
+
+# Autodetect JAVA_HOME if not defined
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+ . /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+ . /usr/lib/bigtop-utils/bigtop-detect-javahome
+fi
+
+RETVAL_SUCCESS=0
+
+STATUS_RUNNING=0
+STATUS_DEAD=1
+STATUS_DEAD_AND_LOCK=2
+STATUS_NOT_RUNNING=3
+STATUS_DEBIAN_NOT_RUNNING=4
+
+ERROR_PROGRAM_NOT_INSTALLED=5
+ERROR_PROGRAM_NOT_CONFIGURED=6
PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
SYS_FILE="/etc/default/hadoop-hive-@HIVE_DAEMON@"
EXE_FILE="/usr/lib/hive/bin/hive"
PID_FILE="/var/run/hive/hive-@HIVE_DAEMON@.pid"
+LOCKFILE="/var/lock/subsys/hadoop-hive-@HIVE_DAEMON@"
LOG_FILE="/var/log/hive/hive-@HIVE_DAEMON@.log"
HIVE_USER="hive"
-NICENESS="0"
+HIVE_HOME="`eval echo ~$HIVE_USER`"
+NICENESS="+0"
NAME="hadoop-hive-@HIVE_DAEMON@"
-DESC="Hive daemon"
-
-DODTIME=3
-SLAVE_TIMEOUT=300
+DESC="Hive @HIVE_DAEMON@ daemon"
+TIMEOUT=3
[ -f $SYS_FILE ] && . $SYS_FILE
-hive_die() {
- echo "$@"
- exit 1
-}
-hive_is_process_alive() {
- local pid="$1"
- kill -0 $pid > /dev/null 2>&1
-}
-hive_check_pidfile() {
- local pidfile="$1" # IN
- local pid
-
- pid=`cat "$pidfile" 2>/dev/null`
- if [ "$pid" = '' ]; then
- # The file probably does not exist or is empty.
- return 1
- fi
-
- set -- $pid
- pid="$1"
-
- hive_is_process_alive $pid
-}
-hive_process_kill() {
- local pid="$1" # IN
- local signal="$2" # IN
- local second
-
- kill -$signal $pid 2>/dev/null
-
- for second in 0 1 2 3 4 5 6 7 8 9 10; do
- hive_is_process_alive "$pid" || return 0
- sleep 1
- done
-
- return 1
-}
-hive_stop_pidfile() {
- local pidfile="$1" # IN
- local pid
-
- pid=`cat "$pidfile" 2>/dev/null`
- if [ "$pid" = '' ]; then
- # The file probably does not exist or is empty. Success
- return 0
- fi
-
- set -- $pid
- pid="$1"
-
- # First try the easy way
- if hive_process_kill "$pid" 15; then
- return 0
- fi
-
- # Otherwise try the hard way
- if hive_process_kill "$pid" 9; then
- return 0
- fi
-
- return 1
-}
-
hive_start() {
- if hive_check_pidfile $PID_FILE ; then
- exit 0
- fi
+ [ -x $EXE_FILE ] || exit $ERROR_PROGRAM_NOT_INSTALLED
service_name="@HIVE_DAEMON@"
if [ $service_name = "server" ] ; then
service_name="hiveserver"
exec_env="HADOOP_OPTS=\"-Dhive.log.dir=`dirname $LOG_FILE`\""
fi
- echo starting $EXE_FILE, logging to $LOG_FILE
- su -s /bin/sh $HIVE_USER \
- -c "$exec_env nohup nice -n $NICENESS \
- $EXE_FILE --service $service_name $PORT \
- > $LOG_FILE 2>&1 < /dev/null & "'echo $! '"> $PID_FILE"
- sleep 3
- hive_check_pidfile $PID_FILE || hive_die "failed to start @HIVE_DAEMON@"
+ log_success_msg "Starting $desc (hadoop-hive-@HIVE_DAEMON@): "
+ /sbin/start-stop-daemon --quiet --oknodo --start --user $HIVE_USER --name java --background \
+ --chuid $HIVE_USER --nicelevel $NICENESS --chdir $HIVE_HOME \
+ --make-pidfile --pidfile $PID_FILE --startas /bin/sh -- \
+ -c "$exec_env exec $EXE_FILE --service $service_name $PORT > $LOG_FILE 2>&1 < /dev/null"
+
+ RETVAL=$?
+ [ $RETVAL -eq $RETVAL_SUCCESS ] && touch $LOCKFILE
+ return $RETVAL
}
+
hive_stop() {
- if [ -f $PID_FILE ]; then
- hive_stop_pidfile $PID_FILE || hive_die "failed to stop metastore"
- rm $PID_FILE
- fi
+ log_success_msg "Stopping $desc (hadoop-hive-@HIVE_DAEMON@): "
+ killproc -p $PID_FILE java
+ RETVAL=$?
+
+ [ $RETVAL -eq $RETVAL_SUCCESS ] && rm -f $LOCKFILE $PID_FILE
+ return $RETVAL
}
+
hive_restart() {
hive_stop
- [ -n "$DODTIME" ] && sleep $DODTIME
+ [ -n "$TIMEOUT" ] && sleep $TIMEOUT
hive_start
}
+
hive_status() {
- echo -n "$NAME is "
- if hive_check_pidfile $PID_FILE ; then
- echo "running"
- else
- echo "not running"
- exit 1
- fi
+ echo -n "Checking for service $desc: "
+ pidofproc -p $PID_FILE java > /dev/null
+ status=$?
+
+ case "$status" in
+ $STATUS_RUNNING)
+ log_success_msg "@HADOOP_DAEMON@ is running"
+ ;;
+ $STATUS_DEAD)
+ log_failure_msg "@HADOOP_DAEMON@ is dead and pid file exists"
+ ;;
+ $STATUS_DEAD_AND_LOCK)
+ log_failure_msg "@HADOOP_DAEMON@ is dead and lock file exists"
+ ;;
+ $STATUS_NOT_RUNNING|$STATUS_DEBIAN_NOT_RUNNING)
+ log_failure_msg "@HADOOP_DAEMON@ is not running"
+ ;;
+ *)
+ log_failure_msg "@HADOOP_DAEMON@ status is unknown"
+ ;;
+ esac
+ return $status
}
+RETVAL=0
+
case "$1" in
start)
hive_start
@@ -166,7 +147,7 @@ case "$1" in
;;
force-reload|condrestart|try-restart)
- hive_check_pidfile $PID_FILE && hive_restart
+ [ -e $LOCKFILE ] && hive_restart || :
;;
restart|reload)
@@ -179,8 +160,10 @@ case "$1" in
*)
N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop|restart|reload|condrestart|try-restart|force-reload|status|force-stop}" >&2
+ echo "Usage: $N {start|stop|restart|reload|condrestart|try-restart|force-reload|status|force-stop}" >&2
exit 1
;;
esac
+
+exit $RETVAL
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hive/SPECS/hive.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hive/SPECS/hive.spec?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hive/SPECS/hive.spec (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-packages/src/rpm/hive/SPECS/hive.spec Wed Nov 2 23:40:24 2011
@@ -65,11 +65,10 @@ Source0: hive-%{hive_base_version}.tar.g
Source1: do-component-build
Source2: install_hive.sh
Source3: hadoop-hive.sh
-Source4: hadoop-hive.sh.suse
+Source4: hive-site.xml
Source5: hadoop-hive-server.default
Source6: hadoop-hive-metastore.default
Source7: hive.1
-Source8: hive-site.xml
Requires: hadoop >= 0.20.2, bigtop-utils
Obsoletes: %{name}-webinterface
@@ -137,16 +136,10 @@ cp $RPM_SOURCE_DIR/hive-site.xml .
%__install -m 0644 $RPM_SOURCE_DIR/hadoop-hive-metastore.default $RPM_BUILD_ROOT/etc/default/hadoop-hive-metastore
%__install -m 0644 $RPM_SOURCE_DIR/hadoop-hive-server.default $RPM_BUILD_ROOT/etc/default/hadoop-hive-server
-%if %{?suse_version:1}0
-orig_init_file=$RPM_SOURCE_DIR/hadoop-hive.sh.suse
-%else
-orig_init_file=$RPM_SOURCE_DIR/hadoop-hive.sh
-%endif
-
for service in %{hive_services}
do
init_file=$RPM_BUILD_ROOT/%{initd_dir}/%{name}-${service}
- %__cp $orig_init_file $init_file
+ %__cp $RPM_SOURCE_DIR/hadoop-hive.sh $init_file
%__sed -i -e "s|@HIVE_DAEMON@|${service}|" $init_file
chmod 755 $init_file
done
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/src/main/groovy/org/apache/bigtop/itest/flumesmoke/TestFlumeSmoke.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/src/main/groovy/org/apache/bigtop/itest/flumesmoke/TestFlumeSmoke.groovy?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/src/main/groovy/org/apache/bigtop/itest/flumesmoke/TestFlumeSmoke.groovy (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/flume/src/main/groovy/org/apache/bigtop/itest/flumesmoke/TestFlumeSmoke.groovy Wed Nov 2 23:40:24 2011
@@ -67,6 +67,7 @@ class TestFlumeSmoke {
compressionCommonTest("FlumeSmokeBzip2", "bzip2 -d", "*.bz2");
}
+ @Ignore("BIGTOP-218")
@Test(timeout=300000L)
public void testDeflate() {
compressionCommonTest("FlumeSmokeDeflate", "perl -MCompress::Zlib -e 'undef \$/; print uncompress(<>)'", "*.deflate");
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadooptests/TestTestCLI.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadooptests/TestTestCLI.groovy?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadooptests/TestTestCLI.groovy (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hadoop/src/main/groovy/org/apache/bigtop/itest/hadooptests/TestTestCLI.groovy Wed Nov 2 23:40:24 2011
@@ -45,4 +45,11 @@ class TestTestCLI extends TestHDFSCLI {
// The property needs to be set from runtime
System.properties.setProperty('test.cache.data', 'clitest_data');
}
+
+ @Test
+ @Ignore("HADOOP-7730")
+ @Override
+ public void testAll() {
+ super.testAll();
+ }
}
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBaseCompression.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBaseCompression.groovy?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBaseCompression.groovy (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBaseCompression.groovy Wed Nov 2 23:40:24 2011
@@ -83,6 +83,7 @@ class TestHBaseCompression {
}
@Test
+ @Ignore("BIGTOP-218")
void testSnappyCompression() {
_testCompression("snappy");
}
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBasePigSmoke.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBasePigSmoke.groovy?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBasePigSmoke.groovy (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHBasePigSmoke.groovy Wed Nov 2 23:40:24 2011
@@ -64,6 +64,7 @@ class TestHBasePigSmoke {
sh.exec("hadoop fs -rmr $TABLE");
}
+ @Ignore("BIGTOP-219")
@Test(timeout=300000L)
public void Pig2HBase() {
def script = "\n";
@@ -92,6 +93,7 @@ class TestHBasePigSmoke {
}
@Test(timeout=300000L)
+ @Ignore("BIGTOP-219")
public void HBase2Pig() {
def script = "\n";
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHFileOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHFileOutputFormat.java?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHFileOutputFormat.java (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hbase/src/main/groovy/org/apache/bigtop/itest/smoke/TestHFileOutputFormat.java Wed Nov 2 23:40:24 2011
@@ -89,11 +89,13 @@ public class TestHFileOutputFormat {
assertTrue("HDFS cleanup failed", sh.getRet() == 0);
}
+ @Ignore("HBASE-1861")
@Test
public void testMRIncrementalLoad() throws Exception {
doIncrementalLoadTest("testMRIncrementalLoad", false);
}
+ @Ignore("HBASE-1861")
@Test
public void testMRIncrementalLoadWithSplit() throws Exception {
doIncrementalLoadTest("testMRIncrementalLoadWithSplit", true);
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_joins/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_pushdown/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_queries/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/integration/hbase_stats/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/authorization_2/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/auto_join20/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/basic/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketizedhiveinputformat/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/bucketmapjoin5/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/drop_multi_partitions/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/groupby_map_ppr_multi_distinct/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/index_creation/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join19/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/join_filters/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/load_dyn_part14/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/merge_dynamic_partition/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/multi_insert/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/rcfile_columnar/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/stats8/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/union3/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/in
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/in?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/in (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/in Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/out
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/out?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/out (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/hive/src/main/resources/scripts/ql/uniquejoin/out Wed Nov 2 23:40:24 2011
@@ -2,7 +2,7 @@
-- 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 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
Modified: incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/src/main/groovy/org/apache/bigtop/itest/ooziesmoke/TestOozieSmoke.groovy
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/src/main/groovy/org/apache/bigtop/itest/ooziesmoke/TestOozieSmoke.groovy?rev=1196868&r1=1196867&r2=1196868&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/src/main/groovy/org/apache/bigtop/itest/ooziesmoke/TestOozieSmoke.groovy (original)
+++ incubator/bigtop/branches/hadoop-0.22/bigtop-tests/test-artifacts/oozie/src/main/groovy/org/apache/bigtop/itest/ooziesmoke/TestOozieSmoke.groovy Wed Nov 2 23:40:24 2011
@@ -45,9 +45,9 @@ class TestOozieSmoke {
namenode = System.getProperty("org.apache.bigtop.itest.namenode", "${conf.get('fs.default.name')}");
oozie_tar_home = System.getProperty("org.apache.bigtop.itest.oozie_tar_home",
- (new File("/usr/share/doc/oozie/")).exists() ?
- "/usr/share/doc/oozie/" :
- "/usr/share/doc/packages/oozie/");
+ (new File("/usr/share/doc/packages/oozie/")).exists() ?
+ "/usr/share/doc/packages/oozie/" :
+ "/usr/share/doc/oozie*/");
sh.exec("mkdir /tmp/${tmp_dir}",
"cd /tmp/${tmp_dir}",