You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2012/11/16 02:16:33 UTC
svn commit: r1410138 - in /hive/trunk/pdk: build.xml ivy.xml
scripts/build-plugin.xml scripts/conf/ scripts/conf/hive-site.xml
scripts/conf/log4j.properties test-plugin/test/conf/
Author: hashutosh
Date: Fri Nov 16 01:16:32 2012
New Revision: 1410138
URL: http://svn.apache.org/viewvc?rev=1410138&view=rev
Log:
HIVE-3435 : Get pdk pluginTest passed when triggered from both builtin tests and pdk tests on hadoop23 (Zhenxiao Luo via Ashutosh Chauhan)
Added:
hive/trunk/pdk/scripts/conf/
hive/trunk/pdk/scripts/conf/hive-site.xml
hive/trunk/pdk/scripts/conf/log4j.properties
Removed:
hive/trunk/pdk/test-plugin/test/conf/
Modified:
hive/trunk/pdk/build.xml
hive/trunk/pdk/ivy.xml
hive/trunk/pdk/scripts/build-plugin.xml
Modified: hive/trunk/pdk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pdk/build.xml?rev=1410138&r1=1410137&r2=1410138&view=diff
==============================================================================
--- hive/trunk/pdk/build.xml (original)
+++ hive/trunk/pdk/build.xml Fri Nov 16 01:16:32 2012
@@ -42,7 +42,7 @@
</javac>
</target>
- <target name="test" unless="testcase">
+ <target name="test" unless="testcase" depends="ivy-retrieve-test">
<echo message="Project: ${ant.project.name}"/>
<delete quiet="true" dir="${build.dir}/test-plugin"/>
<copy todir="${build.dir}/test-plugin">
Modified: hive/trunk/pdk/ivy.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pdk/ivy.xml?rev=1410138&r1=1410137&r2=1410138&view=diff
==============================================================================
--- hive/trunk/pdk/ivy.xml (original)
+++ hive/trunk/pdk/ivy.xml Fri Nov 16 01:16:32 2012
@@ -31,5 +31,13 @@
conf="compile->default" transitive="false" />
<dependency org="junit" name="junit" rev="${junit.version}"
conf="compile->default" />
+
+ <!-- Test Dependencies -->
+ <dependency org="org.apache.hadoop" name="hadoop-minicluster"
+ rev="${hadoop-0.23.version}" conf="hadoop23.test->default">
+ <artifact name="hadoop-minicluster" ext="jar" />
+ <exclude org="commons-daemon" module="commons-daemon"/><!--bad POM-->
+ <exclude org="org.apache.commons" module="commons-daemon"/><!--bad POM-->
+ </dependency>
</dependencies>
</ivy-module>
Modified: hive/trunk/pdk/scripts/build-plugin.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pdk/scripts/build-plugin.xml?rev=1410138&r1=1410137&r2=1410138&view=diff
==============================================================================
--- hive/trunk/pdk/scripts/build-plugin.xml (original)
+++ hive/trunk/pdk/scripts/build-plugin.xml Fri Nov 16 01:16:32 2012
@@ -25,7 +25,7 @@
<property name="build.classes" location="${build.dir}/classes"/>
<property name="build.metadata" location="${build.dir}/metadata"/>
<property name="install.dir" location="${pdk.script.dir}/../.."/>
- <property name="pdk.test.conf.dir" location="${pdk.script.dir}/../test-plugin/test/conf"/>
+ <property name="pdk.test.conf.dir" location="${pdk.script.dir}/conf"/>
<property name="function.sql.prefix" value=""/>
<property name="plugin.jar.basename"
value="${plugin.libname}-${plugin.version}.jar"/>
@@ -123,6 +123,7 @@
<target name="test" depends="package" unless="testcase">
<path id="hive.hadoop.mock.classpath">
<fileset dir="${build.ivy.lib.dir}/test" includes="*.jar" excludes="hive*.jar"/>
+ <pathelement path="${pdk.test.conf.dir}"/>
</path>
<property name="hive.hadoop.mock.classpath" refid="hive.hadoop.mock.classpath"/>
<junit fork="true" printsummary="on" haltonfailure="true"
Added: hive/trunk/pdk/scripts/conf/hive-site.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pdk/scripts/conf/hive-site.xml?rev=1410138&view=auto
==============================================================================
--- hive/trunk/pdk/scripts/conf/hive-site.xml (added)
+++ hive/trunk/pdk/scripts/conf/hive-site.xml Fri Nov 16 01:16:32 2012
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+ 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.
+-->
+
+<configuration>
+
+</configuration>
Added: hive/trunk/pdk/scripts/conf/log4j.properties
URL: http://svn.apache.org/viewvc/hive/trunk/pdk/scripts/conf/log4j.properties?rev=1410138&view=auto
==============================================================================
--- hive/trunk/pdk/scripts/conf/log4j.properties (added)
+++ hive/trunk/pdk/scripts/conf/log4j.properties Fri Nov 16 01:16:32 2012
@@ -0,0 +1,82 @@
+# 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.
+
+# This file is to configure hadoop log4j
+# Define some default values that can be overridden by system properties
+hadoop.root.logger=DEBUG,DRFA
+hadoop.log.dir=/tmp/
+hadoop.log.file=hadoop.log
+
+# Define the root logger to the system property "hadoop.root.logger".
+log4j.rootLogger=${hadoop.root.logger}, EventCounter
+
+# Logging Threshold
+log4j.threshhold=WARN
+
+# Null Appender
+log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
+
+#
+# Daily Rolling File Appender
+#
+
+log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DRFA.File=${hadoop.log.dir}/${hadoop.log.file}
+
+# Rollver at midnight
+log4j.appender.DRFA.DatePattern=.yyyy-MM-dd
+
+# 30-day backup
+#log4j.appender.DRFA.MaxBackupIndex=30
+log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
+
+# Pattern format: Date LogLevel LoggerName LogMessage
+#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+# Debugging Pattern format
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+
+
+#
+# console
+# Add "console" to rootlogger above if you want to use this
+#
+
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n
+
+#custom logging levels
+#log4j.logger.xxx=DEBUG
+
+#
+# Event Counter Appender
+# Sends counts of logging messages at different severity levels to Hadoop Metrics.
+#
+log4j.appender.EventCounter=org.apache.hadoop.metrics.jvm.EventCounter
+
+
+log4j.category.DataNucleus=ERROR,DRFA
+log4j.category.Datastore=ERROR,DRFA
+log4j.category.Datastore.Schema=ERROR,DRFA
+log4j.category.JPOX.Datastore=ERROR,DRFA
+log4j.category.JPOX.Plugin=ERROR,DRFA
+log4j.category.JPOX.MetaData=ERROR,DRFA
+log4j.category.JPOX.Query=ERROR,DRFA
+log4j.category.JPOX.General=ERROR,DRFA
+log4j.category.JPOX.Enhancer=ERROR,DRFA
+log4j.logger.org.apache.hadoop.conf.Configuration=ERROR,DRFA
+