brianfrankcoopergh-66 reorganize directory structure

adally · Feb 21, 2012 · 2e57c54 · 2e57c54
1 parent 75af673
commit 2e57c54
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 45 deletions.
diff --git a/README b/README
@@ -1,42 +1,29 @@
 Yahoo! Cloud System Benchmark (YCSB)
+====================================
 
+Links
+-----
 http://wiki.github.com/brianfrankcooper/YCSB/
 http://research.yahoo.com/Web_Information_Management/YCSB
 [email protected]
 
+Getting Started
+---------------
 
-Overview
-========
+1. Download the latest release of YCSB:
 
-It is difficult to decide which system is right for your application,
-partially because the features differ between systems, and partially
-because there is not an easy way to compare the performance of one
-system versus another.
+    wget https://github.com/downloads/brianfrankcooper/YCSB/ycsb-0.1.4.tar.gz
+    tar xfvz ycsb-0.1.4
+    cd ycsb-0.1.4
 
-The goal of the YCSB project is to develop a framework and common set
-of workloads for evaluating the performance of different "key-value"
-and "cloud" serving stores. The project comprises two things:
+2. Set up a database to benchmark. There is a README file under each binding
+   directory.
 
-* The YCSB Client, an extensible workload generator
+3. Run YCSB command. 
 
-* The Core workloads, a set of workload scenarios to be executed by
-  the generator
+    bin/ycsb load basic workloads/workloada
+    bin/ycsb run basic workloads/workloada
 
-Although the core workloads provide a well rounded picture of a
-system's performance, the Client is extensible so that you can define
-new and different workloads to examine system aspects, or application
-scenarios, not adequately covered by the core workload. Similarly, the
-Client is extensible to support benchmarking different
-databases. Although we include sample code for benchmarking HBase and
-Cassandra, it is straightforward to write a new interface layer to
-benchmark your favorite database.
-
-A common use of the tool is to benchmark multiple systems and compare
-them. For example, you can install multiple systems on the same
-hardward configuration, and run the same workloads against each
-system. Then you can plot the performance of each system (for example,
-as latency versus throughput curves) to see when one system does
-better than another.
-
-Detailed information about using the benchmark is available in the
-doc/index.html file.
+   Running the `ycsb` command without any argument will print the usage. See
+   https://github.com/brianfrankcooper/YCSB/wiki/Core-Properties for the list
+   of available workload properties.
diff --git a/distribution/src/main/bin/ycsb → bin/ycsb b/distribution/src/main/bin/ycsb → bin/ycsb
diff --git a/distribution/src/main/bin/ycsb.sh → bin/ycsb.sh b/distribution/src/main/bin/ycsb.sh → bin/ycsb.sh
diff --git a/distribution/src/main/assembly/distribution.xml b/distribution/src/main/assembly/distribution.xml
@@ -5,36 +5,49 @@
     <format>tar.gz</format>
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>.</outputDirectory>
+      <fileMode>0644</fileMode>
+      <includes>
+        <include>README</include>
+        <include>CHANGELOG</include>
+        <include>LICENSE.txt</include>
+        <include>NOTICE.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>../workloads</directory>
+      <outputDirectory>workloads</outputDirectory>
+      <fileMode>0644</fileMode>
+    </fileSet>
+  </fileSets>
   <moduleSets>
     <moduleSet>
       <useAllReactorProjects>true</useAllReactorProjects>
       <includeSubModules>true</includeSubModules>
       <sources>
-        <includeModuleDirectory>false</includeModuleDirectory>
+        <includeModuleDirectory>true</includeModuleDirectory>
+
         <fileSets>
           <fileSet>
-            <directory>../</directory>
-            <outputDirectory>.</outputDirectory>
-            <includes>
+            <directory>.</directory>
+            <fileMode>0644</fileMode>
+    	    <includes>
               <include>README</include>
-              <include>CHANGELOG</include>
             </includes>
           </fileSet>
           <fileSet>
             <directory>src/main/conf</directory>
             <outputDirectory>conf</outputDirectory>
             <fileMode>0644</fileMode>
           </fileSet>
-          <fileSet>
-            <directory>src/main/bin</directory>
-            <outputDirectory>bin</outputDirectory>
-	    <fileMode>0755</fileMode>
-          </fileSet>
-          <fileSet>
-            <directory>src/main/resources/workloads</directory>
-            <outputDirectory>workloads</outputDirectory>
-	    <fileMode>0644</fileMode>
-          </fileSet>
 	  <fileSet>
             <outputDirectory>lib</outputDirectory>
             <directory>target</directory>

diff --git a/...on/src/main/resources/workloads/workloada → workloads/workloada b/...on/src/main/resources/workloads/workloada → workloads/workloada
diff --git a/...on/src/main/resources/workloads/workloadb → workloads/workloadb b/...on/src/main/resources/workloads/workloadb → workloads/workloadb
diff --git a/...on/src/main/resources/workloads/workloadc → workloads/workloadc b/...on/src/main/resources/workloads/workloadc → workloads/workloadc
diff --git a/...on/src/main/resources/workloads/workloadd → workloads/workloadd b/...on/src/main/resources/workloads/workloadd → workloads/workloadd
diff --git a/...on/src/main/resources/workloads/workloade → workloads/workloade b/...on/src/main/resources/workloads/workloade → workloads/workloade
diff --git a/...on/src/main/resources/workloads/workloadf → workloads/workloadf b/...on/src/main/resources/workloads/workloadf → workloads/workloadf