hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r410649 - in /lucene/hadoop/trunk: build.xml src/test/org/apache/hadoop/fs/DFSCIOTest.java src/test/org/apache/hadoop/fs/TestDFSCIO.java src/test/org/apache/hadoop/test/AllTestDriver.java
Date Wed, 31 May 2006 19:46:19 GMT
Author: cutting
Date: Wed May 31 12:46:18 2006
New Revision: 410649

URL: http://svn.apache.org/viewvc?rev=410649&view=rev
Log:
Remove TestDFSCIO from default test & package targets, since it doesn't yet work on all
platforms.

Added:
    lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java
      - copied, changed from r410637, lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestDFSCIO.java
Removed:
    lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestDFSCIO.java
Modified:
    lucene/hadoop/trunk/build.xml
    lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java

Modified: lucene/hadoop/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/build.xml?rev=410649&r1=410648&r2=410649&view=diff
==============================================================================
--- lucene/hadoop/trunk/build.xml (original)
+++ lucene/hadoop/trunk/build.xml Wed May 31 12:46:18 2006
@@ -86,8 +86,7 @@
     <mkdir dir="${build.webapps}/task/WEB-INF"/>
     <mkdir dir="${build.webapps}/job/WEB-INF"/>
     <mkdir dir="${build.examples}"/>
-    <mkdir dir="${build.libhdfs}"/>
-
+ 
     <mkdir dir="${test.build.dir}"/>
     <mkdir dir="${test.build.classes}"/>
 
@@ -123,7 +122,7 @@
       />
   </target>
 
-  <target name="compile" depends="init, record-parser, compile-libhdfs">
+  <target name="compile" depends="init, record-parser">
 
     <jsp-compile
      uriroot="${src.webapps}/task"
@@ -315,11 +314,10 @@
   <!-- ================================================================== -->
   <!--                                                                    -->
   <!-- ================================================================== -->
-  <target name="package" depends="jar, javadoc, examples, compile-test, compile-libhdfs">
+  <target name="package" depends="jar, javadoc, examples, compile-test">
     <mkdir dir="${dist.dir}"/>
     <mkdir dir="${dist.dir}/lib"/>
     <mkdir dir="${dist.dir}/bin"/>
-    <mkdir dir="${dist.dir}/libhdfs"/>
     <mkdir dir="${dist.dir}/docs"/>
     <mkdir dir="${dist.dir}/docs/api"/>
 
@@ -349,18 +347,6 @@
         <fileset dir="${dist.dir}/bin"/>
     </chmod>
 
-    <copy todir="${dist.dir}/libhdfs">
-      <fileset dir="${build.libhdfs}" followsymlinks="false"/>
-    </copy>
-
-    <chmod perm="ugo+x" type="file">
-        <fileset dir="${dist.dir}/libhdfs"/>
-    </chmod>
-
-    <exec dir="${dist.dir}/libhdfs" executable="ln">
-		<arg line="-sf libhdfs.so.${libhdfs.version} libhdfs.so"/>
-     </exec>
-
     <copy todir="${dist.dir}/docs">
       <fileset dir="${build.docs}"/>
     </copy>
@@ -426,6 +412,7 @@
   <!-- libhdfs targets. For now, they must be called explicitly.          -->
   <!-- ================================================================== -->
   <target name="compile-libhdfs" depends="init">
+    <mkdir dir="${build.libhdfs}"/>
     <exec dir="${basedir}/src/c++/libhdfs" executable="make">
       <env key="OS_NAME" value="${os.name}"/>
       <env key="OS_ARCH" value="${os.arch}"/>

Copied: lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java (from r410637, lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestDFSCIO.java)
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java?p2=lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java&p1=lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestDFSCIO.java&r1=410637&r2=410649&rev=410649&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/TestDFSCIO.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/fs/DFSCIOTest.java Wed May 31 12:46:18
2006
@@ -56,25 +56,25 @@
  *
  * @author Konstantin Shvachko
  */
-public class TestDFSCIO extends TestCase {
+public class DFSCIOTest extends TestCase {
   // Constants
   private static final int TEST_TYPE_READ = 0;
   private static final int TEST_TYPE_WRITE = 1;
   private static final int TEST_TYPE_CLEANUP = 2;
   private static final int DEFAULT_BUFFER_SIZE = 1000000;
   private static final String BASE_FILE_NAME = "test_io_";
-  private static final String DEFAULT_RES_FILE_NAME = "TestDFSCIO_results.log";
+  private static final String DEFAULT_RES_FILE_NAME = "DFSCIOTest_results.log";
   
   private static final Logger LOG = InputFormatBase.LOG;
   private static Configuration fsConfig = new Configuration();
   private static final long MEGA = 0x100000;
-  private static String TEST_ROOT_DIR = System.getProperty("test.build.data","/benchmarks/TestDFSCIO");
+  private static String TEST_ROOT_DIR = System.getProperty("test.build.data","/benchmarks/DFSCIOTest");
   private static Path CONTROL_DIR = new Path(TEST_ROOT_DIR, "io_control");
   private static Path WRITE_DIR = new Path(TEST_ROOT_DIR, "io_write");
   private static Path READ_DIR = new Path(TEST_ROOT_DIR, "io_read");
   private static Path DATA_DIR = new Path(TEST_ROOT_DIR, "io_data");
 
-  private static Path HDFS_TEST_DIR = new Path("/tmp/TestDFSCIO");
+  private static Path HDFS_TEST_DIR = new Path("/tmp/DFSCIOTest");
   private static String HDFS_LIB_VERSION = System.getProperty("libhdfs.version", "1");
   private static String CHMOD = new String("/usr/bin/chmod");
   private static Path HDFS_SHLIB = new Path(HDFS_TEST_DIR + "/libhdfs.so." + HDFS_LIB_VERSION
);
@@ -262,7 +262,7 @@
   private static void runIOTest(  Class mapperClass, 
                                   Path outputDir
                                   ) throws IOException {
-    JobConf job = new JobConf( fsConfig, TestDFSCIO.class );
+    JobConf job = new JobConf( fsConfig, DFSCIOTest.class );
 
     job.setInputPath(CONTROL_DIR);
     job.setInputFormat(SequenceFileInputFormat.class);
@@ -393,7 +393,7 @@
     String resFileName = DEFAULT_RES_FILE_NAME;
     boolean isSequential = false;
 
-    String version="TestDFSCIO.0.0.1";
+    String version="DFSCIOTest.0.0.1";
     String usage = "Usage: TestFDSIO -read | -write | -clean [-nrFiles N] [-fileSize MB]
[-resFile resultFileName] [-bufferSize Bytes] ";
     
     System.out.println(version);
@@ -507,7 +507,7 @@
     double med = rate / 1000 / tasks;
     double stdDev = Math.sqrt( Math.abs(sqrate / 1000 / tasks - med*med ));
     String resultLines[] = {
-      "----- TestDFSCIO ----- : " + ((testType == TEST_TYPE_WRITE) ? "write" :
+      "----- DFSCIOTest ----- : " + ((testType == TEST_TYPE_WRITE) ? "write" :
                                     (testType == TEST_TYPE_READ) ? "read" : 
                                     "unknown"),
       "           Date & time: " + new Date(System.currentTimeMillis()),

Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java?rev=410649&r1=410648&r2=410649&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/test/AllTestDriver.java Wed May 31 12:46:18
2006
@@ -28,7 +28,7 @@
 import org.apache.hadoop.ipc.TestIPC;
 import org.apache.hadoop.ipc.TestRPC;
 import org.apache.hadoop.fs.TestDFSIO;
-import org.apache.hadoop.fs.TestDFSCIO;
+import org.apache.hadoop.fs.DFSCIOTest;
 
 public class AllTestDriver {
   
@@ -51,7 +51,7 @@
 	    pgd.addClass("testsequencefileinputformat", TestSequenceFileInputFormat.class, "A test
for sequence file input format.");
 	    pgd.addClass("testtextinputformat", TestTextInputFormat.class, "A test for text input
format.");
       pgd.addClass("TestDFSIO", TestDFSIO.class, "Distributed i/o benchmark.");
-      pgd.addClass("TestDFSCIO", TestDFSCIO.class, "Distributed i/o benchmark of libhdfs.");
+      pgd.addClass("DFSCIOTest", DFSCIOTest.class, "Distributed i/o benchmark of libhdfs.");
       pgd.addClass("DistributedFSCheck", TestDFSIO.class, "Distributed checkup of the file
system consistency.");
 	    pgd.driver(argv);
 	}



Mime
View raw message