From 28c33096cf4d43ae12db23b97712ea4452d1bd89 Mon Sep 17 00:00:00 2001
From: chenheng <chenheng@fenbi.com>
Date: Wed, 19 Nov 2014 18:21:11 +0800
Subject: [PATCH 1/3] FIX: fix some problems about compile failed

---
 .../main/java/com/kylinolap/cube/dataGen/FactTableGenerator.java    | 3 ++-
 job/pom.xml                                                         | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cube/src/main/java/com/kylinolap/cube/dataGen/FactTableGenerator.java b/cube/src/main/java/com/kylinolap/cube/dataGen/FactTableGenerator.java
index 8ccca7c..f529bca 100644
--- a/cube/src/main/java/com/kylinolap/cube/dataGen/FactTableGenerator.java
+++ b/cube/src/main/java/com/kylinolap/cube/dataGen/FactTableGenerator.java
@@ -220,7 +220,8 @@ private void prepare() throws Exception {
             public int compare(DimensionDesc o1, DimensionDesc o2) {
                 JoinDesc j1 = o2.getJoin();
                 JoinDesc j2 = o1.getJoin();
-                return Integer.compare(j1 != null ? j1.getPrimaryKey().length : 0, j2 != null ? j2.getPrimaryKey().length : 0);
+//                return Integer.compare(j1 != null ? j1.getPrimaryKey().length : 0, j2 != null ? j2.getPrimaryKey().length : 0);
+                return Integer.valueOf(j1 != null ? j1.getPrimaryKey().length : 0).compareTo(Integer.valueOf(j2 != null ? j2.getPrimaryKey().length : 0));
             }
         });
         return dimensions;
diff --git a/job/pom.xml b/job/pom.xml
index 90eb233..b410e56 100644
--- a/job/pom.xml
+++ b/job/pom.xml
@@ -169,7 +169,11 @@
             <artifactId>hadoop-hdfs</artifactId>
             <scope>provided</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.eclipse.jdt</groupId>
+            <artifactId>core</artifactId>
+            <version>3.1.1</version>
+        </dependency>
     </dependencies>
 
     <build>

From dcd83342c16d68db2595bf1557cfb887c659a6b1 Mon Sep 17 00:00:00 2001
From: chenheng <chenheng@fenbi.com>
Date: Wed, 19 Nov 2014 18:33:39 +0800
Subject: [PATCH 2/3] MOD: update denpendency version

---
 pom.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5a4e5e8..33d35b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,16 +9,16 @@
 
     <properties>
         <!-- General Properties -->
-        <javaVersion>1.7</javaVersion>
+        <javaVersion>1.6</javaVersion>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- Hadoop versions -->
-        <hadoop2.version>2.4.1</hadoop2.version>
-        <yarn.version>2.4.1</yarn.version>
-        <hbase-hadoop2.version>0.98.0-hadoop2</hbase-hadoop2.version>
-        <zookeeper.version>3.4.5</zookeeper.version>
-        <hive.version>0.13.0</hive.version>
+        <hadoop2.version>2.5.0</hadoop2.version>
+        <yarn.version>2.5.0</yarn.version>
+        <hbase-hadoop2.version>0.98.6-hadoop2</hbase-hadoop2.version>
+        <zookeeper.version>3.4.6</zookeeper.version>
+        <hive.version>0.13.1</hive.version>
 
         <!-- Dependency versions -->
         <antlr.version>3.4</antlr.version>

From 921a13217662bfd772b6073c87bf64dd09c98ab3 Mon Sep 17 00:00:00 2001
From: chenheng <chenheng@fenbi.com>
Date: Wed, 19 Nov 2014 18:50:18 +0800
Subject: [PATCH 3/3] FIX: fix "/etc/kylin/kylin.properties" hard code in
 Testcase

---
 .../test/java/com/kylinolap/job/CubeDevelopTestCase.java    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/job/src/test/java/com/kylinolap/job/CubeDevelopTestCase.java b/job/src/test/java/com/kylinolap/job/CubeDevelopTestCase.java
index 7a84aec..83653ce 100644
--- a/job/src/test/java/com/kylinolap/job/CubeDevelopTestCase.java
+++ b/job/src/test/java/com/kylinolap/job/CubeDevelopTestCase.java
@@ -208,21 +208,26 @@ private void deployJobJarToLocalDir() throws IOException {
         FileUtils.copyFile(new File(".." + File.separator + "job" + File.separator + "target" + File.separator + jobJarName), targetFile);
     }
 
+    private String getKylinConfProperties() {
+        return System.getenv("KYLIN_CONF") == null ? KylinConfig.KYLIN_CONF_DEFAULT : System.getenv("KYLIN_CONF");
+    }
+
     private void deployKylinPropertyToLocalDir() throws Exception {
         String srcPath = ".." + File.separator + "examples" + File.separator + "test_case_data" + File.separator + "kylin.properties";
-        FileUtils.copyFileToDirectory(new File(srcPath), new File("/etc/kylin"));
+
+        FileUtils.copyFileToDirectory(new File(srcPath), new File(getKylinConfProperties()));
     }
 
     private void deployJobConfToLocalDir(boolean jobEnableLzo) throws Exception {
         String srcFile;
 
         if (jobEnableLzo) {
-            logger.info("job conf: the lzo enabled version is deployed to /etc/kylin");
+            logger.info("job conf: the lzo enabled version is deployed to " + getKylinConfProperties());
 
             srcFile = getExampleTestCaseDataFolder() + JobEngineConfig.HADOOP_JOB_CONF_FILENAME + ".xml";
 
         } else {
-            logger.info("job conf: the lzo disabled version is deployed to /etc/kylin");
+            logger.info("job conf: the lzo disabled version is deployed to " + getKylinConfProperties());
 
             File temp = File.createTempFile("temp", Long.toString(System.nanoTime()));
             temp.delete();
@@ -234,7 +239,7 @@ private void deployJobConfToLocalDir(boolean jobEnableLzo) throws Exception {
             dest.deleteOnExit();
         }
 
-        FileUtils.copyFileToDirectory(new File(srcFile), new File("/etc/kylin"));
+        FileUtils.copyFileToDirectory(new File(srcFile), new File(getKylinConfProperties()));
     }
 
     private String getExampleTestCaseDataFolder() {