Merge pull request #84 from bianhq/master

add workload module

pom.xml

@@ -41,6 +41,7 @@
         <module>rainbow-benchmark</module>
         <module>rainbow-client</module>
         <module>rainbow-web</module>
+        <module>rainbow-workload</module>
     </modules>
 
 </project>

rainbow-evaluate/pom.xml

@@ -142,6 +142,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.scala-tools</groupId>
                 <artifactId>maven-scala-plugin</artifactId>

rainbow-web/pom.xml

@@ -41,6 +41,11 @@
             <artifactId>rainbow-cli</artifactId>
             <version>0.1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.edu.ruc.iir</groupId>
+            <artifactId>rainbow-workload</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>

rainbow-web/src/main/java/cn/edu/ruc/iir/rainbow/web/cmd/CmdReceiver.java

@@ -8,9 +8,9 @@
 import cn.edu.ruc.iir.rainbow.common.cmd.Receiver;
 import cn.edu.ruc.iir.rainbow.common.exception.InvokerException;
 import cn.edu.ruc.iir.rainbow.common.util.ConfigFactory;
-import cn.edu.ruc.iir.rainbow.common.workload.APCFactory;
-import cn.edu.ruc.iir.rainbow.common.workload.AccessPattern;
-import cn.edu.ruc.iir.rainbow.common.workload.AccessPatternCache;
+import cn.edu.ruc.iir.rainbow.workload.APCFactory;
+import cn.edu.ruc.iir.rainbow.workload.AccessPattern;
+import cn.edu.ruc.iir.rainbow.workload.AccessPatternCache;
 import cn.edu.ruc.iir.rainbow.eva.invoker.InvokerWorkloadVectorEvaluation;
 import cn.edu.ruc.iir.rainbow.layout.cmd.CmdGetColumnSize;
 import cn.edu.ruc.iir.rainbow.layout.cmd.CmdOrdering;

rainbow-web/src/test/java/cn/edu/ruc/iir/rainbow/web/PipelineTest.java

@@ -3,8 +3,8 @@
 import cn.edu.ruc.iir.rainbow.benchmark.util.DateUtil;
 import cn.edu.ruc.iir.rainbow.benchmark.util.SysSettings;
 import cn.edu.ruc.iir.rainbow.common.util.ConfigFactory;
-import cn.edu.ruc.iir.rainbow.common.workload.AccessPattern;
-import cn.edu.ruc.iir.rainbow.common.workload.AccessPatternCache;
+import cn.edu.ruc.iir.rainbow.workload.AccessPattern;
+import cn.edu.ruc.iir.rainbow.workload.AccessPatternCache;
 import cn.edu.ruc.iir.rainbow.web.cmd.CmdReceiver;
 import cn.edu.ruc.iir.rainbow.web.hdfs.common.SysConfig;
 import cn.edu.ruc.iir.rainbow.web.hdfs.model.Pipeline;

rainbow-workload/pom.xml

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>rainbow</artifactId>
+        <groupId>cn.edu.ruc.iir</groupId>
+        <version>0.1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>rainbow-workload</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.edu.ruc.iir</groupId>
+            <artifactId>rainbow-common</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- testing -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.0.0-M6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-launcher</artifactId>
+            <version>1.0.0-M6</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>1.0.0-M6</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>

rainbow-common/src/main/java/cn/edu/ruc/iir/rainbow/common/workload/APCFactory.java → rainbow-workload/src/main/java/cn/edu/ruc/iir/rainbow/workload/APCFactory.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.rainbow.common.workload;
+package cn.edu.ruc.iir.rainbow.workload;
 
 import java.util.HashMap;
 import java.util.Map;

rainbow-common/src/main/java/cn/edu/ruc/iir/rainbow/common/workload/AccessPattern.java → rainbow-workload/src/main/java/cn/edu/ruc/iir/rainbow/workload/AccessPattern.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.rainbow.common.workload;
+package cn.edu.ruc.iir.rainbow.workload;
 
 import java.util.HashSet;
 import java.util.Set;

rainbow-common/src/main/java/cn/edu/ruc/iir/rainbow/common/workload/AccessPatternCache.java → rainbow-workload/src/main/java/cn/edu/ruc/iir/rainbow/workload/AccessPatternCache.java

@@ -1,4 +1,4 @@
-package cn.edu.ruc.iir.rainbow.common.workload;
+package cn.edu.ruc.iir.rainbow.workload;
 
 import cn.edu.ruc.iir.rainbow.common.exception.ExceptionHandler;
 import cn.edu.ruc.iir.rainbow.common.exception.ExceptionType;

rainbow-common/src/test/java/cn/edu/ruc/iir/rainbow/common/TestAPC.java → rainbow-workload/src/test/java/cn/edu/ruc/iir/rainbow/workload/TestAPC.java

@@ -1,7 +1,5 @@
-package cn.edu.ruc.iir.rainbow.common;
+package cn.edu.ruc.iir.rainbow.workload;
 
-import cn.edu.ruc.iir.rainbow.common.workload.AccessPattern;
-import cn.edu.ruc.iir.rainbow.common.workload.AccessPatternCache;
 import org.apache.commons.httpclient.util.DateUtil;
 import org.junit.jupiter.api.Test;