Index: build-common.xml
===================================================================
--- build-common.xml (revision 730155)
+++ build-common.xml (working copy)
@@ -38,6 +38,7 @@
+
Index: data/conf/hive-log4j.properties
===================================================================
--- data/conf/hive-log4j.properties (revision 730141)
+++ data/conf/hive-log4j.properties (working copy)
@@ -1 +1,61 @@
-link ../../conf/hive-log4j.properties
\ No newline at end of file
+# Define some default values that can be overridden by system properties
+hive.root.logger=WARN,DRFA
+hive.log.dir=${user.dir}/../build/ql/tmp/
+hive.log.file=hive.log
+
+# Define the root logger to the system property "hadoop.root.logger".
+log4j.rootLogger=${hive.root.logger}, EventCounter
+
+# Logging Threshold
+log4j.threshhold=WARN
+
+#
+# Daily Rolling File Appender
+#
+
+log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DRFA.File=${hive.log.dir}/${hive.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.JPOX=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
+
Index: data/conf/hive-site.xml
===================================================================
--- data/conf/hive-site.xml (revision 730155)
+++ data/conf/hive-site.xml (working copy)
@@ -12,7 +12,7 @@
hive.exec.scratchdir
- /tmp/hive-${user.name}
+ ${user.dir}/../build/ql/tmp
Scratch space for Hive jobs
Index: ql/src/test/org/apache/hadoop/hive/ql/io/TestFlatFileInputFormat.java
===================================================================
--- ql/src/test/org/apache/hadoop/hive/ql/io/TestFlatFileInputFormat.java (revision 730155)
+++ ql/src/test/org/apache/hadoop/hive/ql/io/TestFlatFileInputFormat.java (working copy)
@@ -56,7 +56,7 @@
conf = new Configuration();
job = new JobConf(conf);
fs = FileSystem.getLocal(conf);
- dir = new Path(System.getProperty("test.build.data",".") + "/mapred");
+ dir = new Path(System.getProperty("test.data.dir",".") + "/mapred");
file = new Path(dir, "test.txt");
reporter = Reporter.NULL;
fs.delete(dir, true);
@@ -133,7 +133,7 @@
conf = new Configuration();
job = new JobConf(conf);
fs = FileSystem.getLocal(conf);
- dir = new Path(System.getProperty("test.build.data",".") + "/mapred");
+ dir = new Path(System.getProperty("test.data.dir",".") + "/mapred");
file = new Path(dir, "test.txt");
reporter = Reporter.NULL;
fs.delete(dir, true);
@@ -210,7 +210,7 @@
conf = new Configuration();
job = new JobConf(conf);
fs = FileSystem.getLocal(conf);
- dir = new Path(System.getProperty("test.build.data",".") + "/mapred");
+ dir = new Path(System.getProperty("test.data.dir",".") + "/mapred");
file = new Path(dir, "test.txt");
reporter = Reporter.NULL;
fs.delete(dir, true);
Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
===================================================================
--- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 730155)
+++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (working copy)
@@ -68,7 +68,7 @@
public class QTestUtil {
private String testWarehouse;
- private String tmpdir = "/tmp/"+System.getProperty("user.name")+"/";
+ private String tmpdir = System.getProperty("user.dir")+"/../build/ql/tmp";
private Path tmppath = new Path(tmpdir);
private String testFiles;
private String outDir;
@@ -524,7 +524,7 @@
cmdArray[1] = "-b";
cmdArray[2] = "-I";
cmdArray[3] = "\\(\\(\\)" +
- "\\|\\(/tmp/.*\\)" +
+ "\\|\\(.*/tmp/.*\\)" +
"\\|\\(file:.*\\)" +
"\\|\\(/.*/warehouse/.*\\)\\)";
cmdArray[4] = outf.getPath();
@@ -634,7 +634,7 @@
cmdArray = new String[5];
cmdArray[0] = "diff";
cmdArray[1] = "-I";
- cmdArray[2] = "\\(file:\\)\\|\\(tmp/hive-.*\\)";
+ cmdArray[2] = "\\(file:\\)\\|\\(/tmp/.*\\)";
cmdArray[3] = (new File(logDir, tname + ".out")).getPath();
cmdArray[4] = (new File(outDir, tname + ".out")).getPath();
System.out.println(cmdArray[0] + " " + cmdArray[1] + " " + cmdArray[2] + " " +
Index: ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java
===================================================================
--- ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (revision 730155)
+++ ql/src/java/org/apache/hadoop/hive/ql/optimizer/GenMapRedUtils.java (working copy)
@@ -313,7 +313,7 @@
int randomid = opProcCtx.getRandomId();
int pathid = opProcCtx.getPathId();
- String taskTmpDir = scratchDir + File.separator + randomid + '.' + pathid ;
+ String taskTmpDir = (new Path(scratchDir + File.separator + randomid + '.' + pathid)).toString();
pathid++;
opProcCtx.setPathId(pathid);