kylin git commit: KYLIN-1372 fix CI

2016-01-31 Thread mahongbin 
Repository: kylin
Updated Branches:
  refs/heads/1.x-staging 75970c3b1 -> 555a2e566


KYLIN-1372 fix CI


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/555a2e56
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/555a2e56
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/555a2e56

Branch: refs/heads/1.x-staging
Commit: 555a2e5667837d6bdf16460a34c88f3f5130bf31
Parents: 75970c3
Author: honma 
Authored: Mon Feb 1 13:48:06 2016 +0800
Committer: honma 
Committed: Mon Feb 1 13:48:06 2016 +0800

--
 query/src/test/resources/query/sql_dynamic/query03.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/555a2e56/query/src/test/resources/query/sql_dynamic/query03.sql
--
diff --git a/query/src/test/resources/query/sql_dynamic/query03.sql 
b/query/src/test/resources/query/sql_dynamic/query03.sql
index 31d5d0b..3187c33 100644
--- a/query/src/test/resources/query/sql_dynamic/query03.sql
+++ b/query/src/test/resources/query/sql_dynamic/query03.sql
@@ -17,7 +17,7 @@
 --
 
 select test_cal_dt.week_beg_dt,sum(test_kylin_fact.price) as GMV
- , count(1) as TRANS_CNT, count(distinct leaf_categ_id) as LEAF_CATEG_CNT
+ , count(1) as TRANS_CNT
  from test_kylin_fact
  inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt

kylin git commit: KYLIN-1232 ODBC - Refine connection and configuration dialog UI

2016-01-31 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/2.x-staging 957dd42e7 -> 9b19b69f1


KYLIN-1232 ODBC - Refine connection and configuration dialog UI


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/9b19b69f
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9b19b69f
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9b19b69f

Branch: refs/heads/2.x-staging
Commit: 9b19b69f1776a5fa6edcdcdaa64bdde88af9837a
Parents: 957dd42
Author: lidongsjtu 
Authored: Mon Feb 1 15:29:46 2016 +0800
Committer: lidongsjtu 
Committed: Mon Feb 1 15:29:46 2016 +0800

--
 odbc/Driver/GODBC.RC   | 205 +++-
 odbc/Driver/KO_CONN.CPP|  47 +++-
 odbc/Driver/KO_Config.cpp  |  90 +++---
 odbc/Driver/banner.bmp | Bin 0 -> 93654 bytes
 odbc/Driver/driver.vcxproj |   5 +-
 odbc/Driver/driver.vcxproj.filters |   7 +-
 odbc/Driver/resource.h |  10 +-
 7 files changed, 255 insertions(+), 109 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/9b19b69f/odbc/Driver/GODBC.RC
--
diff --git a/odbc/Driver/GODBC.RC b/odbc/Driver/GODBC.RC
index dd2cb3f..9e0f4c3 100644
--- a/odbc/Driver/GODBC.RC
+++ b/odbc/Driver/GODBC.RC
@@ -31,6 +31,23 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /
+// Chinese (Simplified, PRC) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
+LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
+#pragma code_page(936)
+
+/
+//
+// Bitmap
+//
+
+IDB_BITMAP1 BITMAP  "banner.bmp"
+#endif// Chinese (Simplified, PRC) resources
+/
+
+
+/
 // English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
@@ -43,21 +60,21 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // TEXTINCLUDE
 //
 
-1 TEXTINCLUDE
+1 TEXTINCLUDE 
 BEGIN
-"resource.h\0"
+"resource.h\0"
 END
 
-2 TEXTINCLUDE
+2 TEXTINCLUDE 
 BEGIN
-"#include ""afxres.h""\r\n"
-"\0"
+"#include ""afxres.h""\r\n"
+"\0"
 END
 
-3 TEXTINCLUDE
+3 TEXTINCLUDE 
 BEGIN
-"\r\n"
-"\0"
+"\r\n"
+"\0"
 END
 
 #endif// APSTUDIO_INVOKED
@@ -69,36 +86,36 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 1, 0, 0, 1
-PRODUCTVERSION 1, 0, 0, 1
-FILEFLAGSMASK 0x3fL
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
-FILEFLAGS 0x1L
+ FILEFLAGS 0x1L
 #else
-FILEFLAGS 0x0L
+ FILEFLAGS 0x0L
 #endif
-FILEOS 0x40004L
-FILETYPE 0x2L
-FILESUBTYPE 0x0L
-BEGIN
-BLOCK "StringFileInfo"
-BEGIN
-BLOCK "040904b0"
-BEGIN
-VALUE "CompanyName", "kylinolap"
-VALUE "FileDescription", "Kylin ODBC Driver"
-VALUE "FileVersion", "1, 0, 0, 1"
-VALUE "InternalName", "KylinODBC"
-VALUE "LegalCopyright", "Copyright ?2014"
-VALUE "OriginalFilename", "driver.dll"
-VALUE "ProductName", "Kylin ODBC Driver"
-VALUE "ProductVersion", "1, 0, 0, 1"
-END
-END
-BLOCK "VarFileInfo"
+ FILEOS 0x40004L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
 BEGIN
-VALUE "Translation", 0x409, 1200
-END
+BLOCK "StringFileInfo"
+BEGIN
+BLOCK "040904b0"
+BEGIN
+VALUE "CompanyName", "kylinolap"
+VALUE "FileDescription", "Kylin ODBC Driver"
+VALUE "FileVersion", "1, 0, 0, 1"
+VALUE "InternalName", "KylinODBC"
+VALUE "LegalCopyright", "Copyright ?2014"
+VALUE "OriginalFilename", "driver.dll"
+VALUE "ProductName", "Kylin ODBC Driver"
+VALUE "ProductVersion", "1, 0, 0, 1"
+END
+END
+BLOCK "VarFileInfo"
+BEGIN
+VALUE "Translation", 0x409, 1200
+END
 END
 
 
@@ -107,48 +124,52 @@ END
 // Dialog
 //
 
-IDD_DSN_CFG1 DIALOGEX 0, 0, 263, 162
+IDD_DSN_CFG1 DIALOGEX 0, 0, 265, 210
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
-CAPTION "Kylin Driver Connect Dialog"
+CAPTION "Apache Kylin Driver Connection"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-PUSHBUTTON  "Cancel", IDCANCEL, 152, 138, 50, 14
-LTEXT   "Server Host", IDC_STATIC, 49, 16, 38, 8
-LTEXT   "Port", IDC_STATIC, 69, 32, 14, 8
-EDITTEXTIDC_SERVER, 92, 14, 110, 12, ES_AUTOHSCROLL
-EDITTEXTIDC_PORT, 92, 31, 30, 12, ES_AUTOHSCROLL
-LTEXT   "(only https service permitted)", IDC_STATIC, 93, 45, 90, 8
-LTEXT   "Username", IDC_STATIC, 52, 60, 33, 8
-LTEXT   "Password", IDC_STATIC, 54, 79, 32, 8
-EDITTEXTIDC_UID, 92, 59, 111,

kylin git commit: KYLIN-1372 fix CI

2016-01-31 Thread mahongbin 
Repository: kylin
Updated Branches:
  refs/heads/2.0-rc a9637c9c5 -> d3250acf3


KYLIN-1372 fix CI


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d3250acf
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d3250acf
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d3250acf

Branch: refs/heads/2.0-rc
Commit: d3250acf3516ceffc08f830ecac2993cdc1a91fd
Parents: a9637c9
Author: honma 
Authored: Mon Feb 1 13:44:02 2016 +0800
Committer: honma 
Committed: Mon Feb 1 13:45:58 2016 +0800

--
 kylin-it/src/test/resources/query/sql_dynamic/query03.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/d3250acf/kylin-it/src/test/resources/query/sql_dynamic/query03.sql
--
diff --git a/kylin-it/src/test/resources/query/sql_dynamic/query03.sql 
b/kylin-it/src/test/resources/query/sql_dynamic/query03.sql
index 90574f7..ceefe70 100644
--- a/kylin-it/src/test/resources/query/sql_dynamic/query03.sql
+++ b/kylin-it/src/test/resources/query/sql_dynamic/query03.sql
@@ -17,7 +17,7 @@
 --
 
 select test_cal_dt.week_beg_dt,sum(test_kylin_fact.price) as GMV
- , count(1) as TRANS_CNT, count(distinct test_kylin_fact.leaf_categ_id) as 
LEAF_CATEG_CNT
+ , count(1) as TRANS_CNT
  from test_kylin_fact
  inner JOIN edw.test_cal_dt as test_cal_dt
  ON test_kylin_fact.cal_dt = test_cal_dt.cal_dt

kylin git commit: KYLIN-1386 ODBC - Fix issue of duplicated projects in Connection/DSN dialog

2016-01-31 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/2.x-staging 84b56665d -> 3869540c5


KYLIN-1386 ODBC - Fix issue of duplicated projects in Connection/DSN dialog


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3869540c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3869540c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3869540c

Branch: refs/heads/2.x-staging
Commit: 3869540c5ef8c3bd4b3b7204c1e1b831b2b6a15e
Parents: 84b5666
Author: lidongsjtu 
Authored: Mon Feb 1 11:10:06 2016 +0800
Committer: lidongsjtu 
Committed: Mon Feb 1 11:10:55 2016 +0800

--
 odbc/Driver/KO_CONN.CPP   | 2 ++
 odbc/Driver/KO_Config.cpp | 2 ++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/3869540c/odbc/Driver/KO_CONN.CPP
--
diff --git a/odbc/Driver/KO_CONN.CPP b/odbc/Driver/KO_CONN.CPP
index 7c3c43d..9d31df0 100644
--- a/odbc/Driver/KO_CONN.CPP
+++ b/odbc/Driver/KO_CONN.CPP
@@ -395,6 +395,8 @@ INT_PTR CALLBACK DlgDSNCfg1Proc ( HWND hDlg, UINT uMsg, 
WPARAM wParam, LPARAM lP
 std::vector projects;
 restListProjects ( pgConn->Server, 
pgConn->ServerPort, pgConn->UserName, pgConn->Password, projects );
 
+   // reload project list
+   SendMessage ( 
hwndCombo, CB_RESETCONTENT, 0, 0 );
 for ( unsigned int i = 0 ; i < projects.size(); 
++i ) {
 SendMessage ( hwndCombo, ( UINT ) 
CB_ADDSTRING, ( WPARAM ) 0, ( LPARAM ) projects.at ( i ).c_str() );
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/3869540c/odbc/Driver/KO_Config.cpp
--
diff --git a/odbc/Driver/KO_Config.cpp b/odbc/Driver/KO_Config.cpp
index 69b9d97..bb27fb4 100644
--- a/odbc/Driver/KO_Config.cpp
+++ b/odbc/Driver/KO_Config.cpp
@@ -592,6 +592,8 @@ INT_PTR CALLBACK DlgDSNCfg2Proc ( HWND hDlg, UINT uMsg, 
WPARAM wParam, LPARAM lP
 std::vector projects;
 restListProjects ( serverStr, port, 
uidStr, pwdStr, projects );
 
+   // 
reload project list
+   
SendMessage ( hwndCombo, CB_RESETCONTENT, 0, 0 );
 for ( unsigned int i = 0 ; i < 
projects.size(); ++i ) {
 SendMessage ( hwndCombo, ( UINT ) 
CB_ADDSTRING, ( WPARAM ) 0, ( LPARAM ) projects.at ( i ).c_str() );
 }

[1/2] kylin git commit: KYLIN-1385 Enhance FactDistinctColumnsJob to use multiple reducers

2016-01-31 Thread shaofengshi 
Repository: kylin
Updated Branches:
  refs/heads/2.x-staging ca1707ee3 -> 84b56665d


KYLIN-1385 Enhance FactDistinctColumnsJob to use multiple reducers

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fba192ef
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fba192ef
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fba192ef

Branch: refs/heads/2.x-staging
Commit: fba192ef7488b452b5b2a0aa0dc82b0d9f3c33de
Parents: ca1707e
Author: shaofengshi 
Authored: Sun Jan 31 16:47:36 2016 +0800
Committer: shaofengshi 
Committed: Sun Jan 31 16:47:59 2016 +0800

--
 .../java/org/apache/kylin/cube/CubeManager.java | 22 +++
 .../mr/steps/FactDistinctColumnPartitioner.java | 26 
 .../engine/mr/steps/FactDistinctColumnsJob.java | 22 ---
 .../mr/steps/FactDistinctColumnsMapperBase.java | 23 ++-
 .../mr/steps/FactDistinctColumnsReducer.java| 68 ++--
 .../mr/steps/FactDistinctHiveColumnsMapper.java |  2 +-
 6 files changed, 102 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/fba192ef/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
--
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java 
b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index 7db3130..84dd30a 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -891,4 +891,26 @@ public class CubeManager implements IRealizationProvider {
 public void setCubeChangeListener(CubeChangeListener listener) {
 this.listener = listener;
 }
+
+/**
+ * Get the columns which need build the dictionary from fact table. (the 
column exists on fact and is not fk)
+ * @param cubeDesc
+ * @return
+ * @throws IOException
+ */
+public List getAllDictColumnsOnFact(CubeDesc cubeDesc) throws 
IOException {
+List dictionaryColumns = 
cubeDesc.getAllColumnsNeedDictionary();
+
+List factDictCols = new ArrayList();
+DictionaryManager dictMgr = DictionaryManager.getInstance(config);
+for (int i = 0; i < dictionaryColumns.size(); i++) {
+TblColRef col = dictionaryColumns.get(i);
+
+String scanTable = dictMgr.decideSourceData(cubeDesc.getModel(), 
true, col).getTable();
+if (cubeDesc.getModel().isFactTable(scanTable)) {
+factDictCols.add(col);
+}
+}
+return factDictCols;
+}
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/fba192ef/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnPartitioner.java
--
diff --git 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnPartitioner.java
 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnPartitioner.java
new file mode 100644
index 000..0320ebe
--- /dev/null
+++ 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnPartitioner.java
@@ -0,0 +1,26 @@
+package org.apache.kylin.engine.mr.steps;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapreduce.Partitioner;
+import org.apache.kylin.common.util.Bytes;
+
+/**
+ */
+public class FactDistinctColumnPartitioner extends Partitioner {
+private Configuration conf;
+
+@Override
+public int getPartition(Text key, Text value, int numReduceTasks) {
+
+long colIndex = Bytes.toLong(key.getBytes(), 0, Bytes.SIZEOF_LONG);
+if (colIndex < 0) {
+// the last reducer is for merging hll
+return numReduceTasks - 1;
+} else {
+return (int) (colIndex);
+}
+
+}
+
+}

http://git-wip-us.apache.org/repos/asf/kylin/blob/fba192ef/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java
--
diff --git 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java
 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java
index 83bced1..1373e2c 100644
--- 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java
+++ 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsJob.java
@@ -18,8 +18,6 @@
 
 package org.apache.kylin.engine.mr.steps;
 
-import java.io.IOException;
-
 import org.apache.commons.cli.Options;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.NullWritable;
@@ -32,14 +30,19 @@

[2/2] kylin git commit: ignore two files under webapp/app/

2016-01-31 Thread shaofengshi 
ignore two files under webapp/app/

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/84b56665
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/84b56665
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/84b56665

Branch: refs/heads/2.x-staging
Commit: 84b56665dd26f8b7a1d9e745f66057203cb846ff
Parents: fba192e
Author: shaofengshi 
Authored: Sun Jan 31 17:04:36 2016 +0800
Committer: shaofengshi 
Committed: Sun Jan 31 17:04:36 2016 +0800

--
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/84b56665/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 7d1091d..bb8b3b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,5 @@ ebay*
 build/commit_SHA1
 dist/
 tomcat/
+webapp/app/kylin-servlet.xml
+webapp/app/web.xml
\ No newline at end of file

kylin git commit: fix a potential bug in FactDistinctColumnsReducer

2016-01-31 Thread shaofengshi 
Repository: kylin
Updated Branches:
  refs/heads/2.0-rc 51f128b79 -> a9637c9c5


fix a potential bug in FactDistinctColumnsReducer

Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a9637c9c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a9637c9c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a9637c9c

Branch: refs/heads/2.0-rc
Commit: a9637c9c576764fddb20ecca3c1230ba658369bb
Parents: 51f128b
Author: shaofengshi 
Authored: Sun Jan 31 17:17:17 2016 +0800
Committer: shaofengshi 
Committed: Sun Jan 31 17:19:53 2016 +0800

--
 .gitignore   | 2 ++
 .../apache/kylin/engine/mr/steps/FactDistinctColumnsReducer.java | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/a9637c9c/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 7d1091d..bb8b3b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,5 @@ ebay*
 build/commit_SHA1
 dist/
 tomcat/
+webapp/app/kylin-servlet.xml
+webapp/app/web.xml
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/kylin/blob/a9637c9c/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsReducer.java
--
diff --git 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsReducer.java
 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsReducer.java
index 17ed7d6..c7eccee 100644
--- 
a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsReducer.java
+++ 
b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/FactDistinctColumnsReducer.java
@@ -19,6 +19,7 @@
 package org.apache.kylin.engine.mr.steps;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -115,8 +116,7 @@ public class FactDistinctColumnsReducer extends 
KylinReducer