[10/11] kylin git commit: KYLIN-1389 ODBC - Reformatting C++ Code

2016-02-01 Thread lidong
http://git-wip-us.apache.org/repos/asf/kylin/blob/3c2329dc/odbc/Common/REST.cpp
--
diff --git a/odbc/Common/REST.cpp b/odbc/Common/REST.cpp
index 15921aa..bc3a6b8 100644
--- a/odbc/Common/REST.cpp
+++ b/odbc/Common/REST.cpp
@@ -15,8 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
- 
+
+
 #include 
 #include 
 #include 
@@ -45,9 +45,10 @@ using namespace concurrency::streams;
 using namespace web;
 using namespace web::json;
 
-void printLog ( const char* msg ) {
-time_t now = time ( 0 );
-struct tm  tstruct;
+void printLog ( const char* msg )
+{
+time_t now = time ( 0 );
+struct tm tstruct;
 char buffer[100];
 tstruct = *localtime (  );
 strftime ( buffer, 100, "%Y-%m-%d.%X",  );
@@ -63,17 +64,21 @@ void printLog ( const char* msg ) {
 /// 
 /// 
 /// 
-int ScanForLength ( std::vector results, int column ) {
+int ScanForLength ( std::vector  results, int column )
+{
 int max = 0;
-
-for ( auto p = results.begin(); p < results.end(); p++ ) {
+
+for ( auto p = results . begin (); p < results . end (); p++ )
+{
 SQLRowContent* result = *p;
-int length = result->contents[column].size();
-
+int length = result -> contents[column] . size ();
+
 if ( length > max )
-{ max = length; }
+{
+max = length;
+}
 }
-
+
 return max;
 }
 
@@ -84,299 +89,355 @@ int ScanForLength ( std::vector results, 
int column ) {
 /// 
 /// 
 /// 
-int ScanForScale ( std::vector results, int column ) {
+int ScanForScale ( std::vector  results, int column )
+{
 int max = 0;
-
-for ( auto p = results.begin(); p < results.end(); p++ ) {
+
+for ( auto p = results . begin (); p < results . end (); p++ )
+{
 SQLRowContent* result = *p;
-int length = result->contents[column].size();
-int dotLocation = result->contents[column].find ( L"." );
-
-if ( dotLocation != string::npos ) {
+int length = result -> contents[column] . size ();
+int dotLocation = result -> contents[column] . find ( L"." );
+
+if ( dotLocation != string::npos )
+{
 int scale = length - 1 - dotLocation;
-
+
 if ( scale > max )
-{ max = scale; }
+{
+max = scale;
+}
 }
 }
-
+
 return max;
 }
 
 
-void overwrite ( SQLResponse* res ) {
-for ( int i = 0; i < ( int ) res->columnMetas.size(); ++i ) {
-SelectedColumnMeta* meta = res->columnMetas[i];
-ODBCTypes t = ( ODBCTypes ) meta->columnType;
+void overwrite ( SQLResponse* res )
+{
+for ( int i = 0; i < ( int ) res -> columnMetas . size (); ++i )
+{
+SelectedColumnMeta* meta = res -> columnMetas[i];
+ODBCTypes t = ( ODBCTypes ) meta -> columnType;
 int scale = 0;
 int length = 0;
-
-switch ( t ) {
-case ODBCTypes::ODBC_Numeric:
-case ODBCTypes::ODBC_Decimal:
-case ODBCTypes::ODBC_Double:
-case ODBCTypes::ODBC_Real:
-case ODBCTypes::ODBC_Float:
-scale = ScanForScale ( res->results, i );
-meta->scale = scale;
-meta->scale = 4;
+
+switch ( t )
+{
+case ODBCTypes::ODBC_Numeric :
+case ODBCTypes::ODBC_Decimal :
+case ODBCTypes::ODBC_Double :
+case ODBCTypes::ODBC_Real :
+case ODBCTypes::ODBC_Float :
+scale = ScanForScale ( res -> results, i );
+meta -> scale = scale;
+meta -> scale = 4;
 break;
-
-case ODBCTypes::ODBC_Char:
-case ODBCTypes::ODBC_VarChar:
-case ODBCTypes::ODBC_LongVarChar:
-case ODBCTypes::ODBC_WChar:
-case ODBCTypes::ODBC_WVarChar:
-case ODBCTypes::ODBC_WLongVarChar:
-case ODBCTypes::ODBC_DateTime:
-case ODBCTypes::ODBC_Type_Date:
-case ODBCTypes::ODBC_Type_Time:
-case ODBCTypes::ODBC_Type_Timestamp:
-length = ScanForLength ( res->results, i );
-meta->displaySize = length;
-meta->precision = length;
+
+case ODBCTypes::ODBC_Char :
+case ODBCTypes::ODBC_VarChar :
+case ODBCTypes::ODBC_LongVarChar :
+case ODBCTypes::ODBC_WChar :
+case ODBCTypes::ODBC_WVarChar :
+case ODBCTypes::ODBC_WLongVarChar :
+case ODBCTypes::ODBC_DateTime :
+case ODBCTypes::ODBC_Type_Date :
+case ODBCTypes::ODBC_Type_Time :
+case ODBCTypes::ODBC_Type_Timestamp :
+

[08/11] kylin git commit: KYLIN-1389 ODBC - Reformatting C++ Code

2016-02-01 Thread lidong
http://git-wip-us.apache.org/repos/asf/kylin/blob/3c2329dc/odbc/Driver/KO_CONN.CPP
--
diff --git a/odbc/Driver/KO_CONN.CPP b/odbc/Driver/KO_CONN.CPP
index 28642b1..cee9b39 100644
--- a/odbc/Driver/KO_CONN.CPP
+++ b/odbc/Driver/KO_CONN.CPP
@@ -15,8 +15,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
- 
+
+
 // 
 //
 // File:KO_CONN.CPP
@@ -58,110 +58,126 @@
 INT_PTR CALLBACK DlgDSNCfg1Proc ( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM 
lParam );
 
 // - local functions --
-static eGoodBad CreateAndSetConnProp ( pODBCConn pConn, Word pPropID, 
void* pPropValue );
+static eGoodBad CreateAndSetConnProp ( pODBCConn pConn, Word pPropID, void* 
pPropValue );
 
-static eGoodBad PutDataToDlgDSNCfg1 ( pODBCConn pConn, HWND hDlg );
+static eGoodBad PutDataToDlgDSNCfg1 ( pODBCConn pConn, HWND hDlg );
 
-static eGoodBad GetDataFromDlgDSNCfg1 ( HWND hDlg, pODBCConn pConn );
+static eGoodBad GetDataFromDlgDSNCfg1 ( HWND hDlg, pODBCConn pConn );
 
-static Word PromptForConnInfo ( SQLHDBC pConn );
+static Word PromptForConnInfo ( SQLHDBC pConn );
 
-static eGoodBad LoadKeyValuesfromFileDSN ( pODBCConn pConn, CStrPtr 
pDSNName, Word* pNumPair,
-   struct ODBCKV** pKV );
+static eGoodBad LoadKeyValuesfromFileDSN ( pODBCConn pConn, CStrPtr pDSNName, 
Word* pNumPair,
+   struct ODBCKV** pKV );
 
-static bool AddKVToConnStr ( StrPtr pKey, StrPtr pValue, Word* iPos, 
StrPtr pStrConn, Word pMaxLen );
-static bool BuildConnStr ( char* pStrConn, Word pMaxLen, pODBCConn 
pConn, struct ODBCKV* KVInput,
-   Word iKVInputPairs, struct ODBCKV* 
KVFileDSN, Word iKVFileDSNPairs );
+static bool AddKVToConnStr ( StrPtr pKey, StrPtr pValue, Word* iPos, StrPtr 
pStrConn, Word pMaxLen );
+static bool BuildConnStr ( char* pStrConn, Word pMaxLen, pODBCConn pConn, 
struct ODBCKV* KVInput,
+   Word iKVInputPairs, struct ODBCKV* KVFileDSN, Word 
iKVFileDSNPairs );
 
-static const char *supportedProtocols[] = { PROTOCOL_HTTPS, PROTOCOL_HTTP };
-static const char *defaultPorts[] = { PORT_HTTPS_DEFAULT, PORT_HTTP_DEFAULT };
+static const char* supportedProtocols[] = { PROTOCOL_HTTPS, PROTOCOL_HTTP };
+static const char* defaultPorts[] = { PORT_HTTPS_DEFAULT, PORT_HTTP_DEFAULT };
 
 // ---
 // to set a specified property in the connection structure
 // ---
 
-eGoodBad SetConnProp ( pODBCConn pConn, Word pPropID, void* pPropValue ) {
+eGoodBad SetConnProp ( pODBCConn pConn, Word pPropID, void* pPropValue )
+{
 // note
 // this function does not create a copy of char data
 // it just transfers the pointer
 // numeric data is assumed to be a pointer
-
+
 // check property
-switch ( pPropID ) {
-case CONN_PROP_SERVER:
-
+switch ( pPropID )
+{
+case CONN_PROP_SERVER :
+
 // check if a new value has to be put
-if ( pPropValue ) {
-copyTrimmed ( & ( ( char* ) pConn->Server ), ( char* ) 
pPropValue );
+if ( pPropValue )
+{
+copyTrimmed ( & ( ( char* ) pConn -> Server ), ( char* ) 
pPropValue );
 }
-
-if ( pConn->Server == NULL || strlen ( pConn->Server ) == 0 ) {
+
+if ( pConn -> Server == NULL || strlen ( pConn -> Server ) == 0 )
+{
 __ODBCPopMsg ( "Server cannot be empty" );
 return BAD;
 }
-
+
 __ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "The server is set to 
%s", pConn->Server ) );
 break;
-
-case CONN_PROP_PORT:
-
+
+case CONN_PROP_PORT :
+
 // numeric values are passed as pointer to value
 if ( pPropValue )
-{ pConn->ServerPort = * ( ( ULong* ) pPropValue ); }
-
-if ( pConn->ServerPort == 0 ) {
+{
+pConn -> ServerPort = * ( ( ULong* ) pPropValue );
+}
+
+if ( pConn -> ServerPort == 0 )
+{
 __ODBCPopMsg ( "ServerPort cannot be 0" );
 return BAD;
 }
-
+
 __ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "The port is set to %d", 
pConn->ServerPort ) );
 break;
-
-case CONN_PROP_UID:
-
+
+case CONN_PROP_UID :
+
 // check if a new value has to be put
 if ( pPropValue )
-{ copyTrimmed ( & ( ( char* ) 

[05/11] kylin git commit: KYLIN-1389 ODBC - Reformatting C++ Code

2016-02-01 Thread lidong
http://git-wip-us.apache.org/repos/asf/kylin/blob/3c2329dc/odbc/Driver/KO_DIAG.CPP
--
diff --git a/odbc/Driver/KO_DIAG.CPP b/odbc/Driver/KO_DIAG.CPP
index a74dd9d..e296335 100644
--- a/odbc/Driver/KO_DIAG.CPP
+++ b/odbc/Driver/KO_DIAG.CPP
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 
 // 
 //
@@ -65,441 +65,573 @@
 #include 
 
 
-
-
-
 // - local functions -
-static pODBCDiagRow  _SQLGetDiagRowX ( pODBCDiag pHandle, Word pRowNum );
-static pODBCDiag _SQLGetDiagHandle ( SQLSMALLINT pHandleType, 
SQLHANDLE pHandle );
+static pODBCDiagRow _SQLGetDiagRowX ( pODBCDiag pHandle, Word pRowNum );
+static pODBCDiag _SQLGetDiagHandle ( SQLSMALLINT pHandleType, SQLHANDLE 
pHandle );
 
 // - local functions -
-static LogLevel currentLogLevel =
-LogLevel_INFO;// Global variable to be set at the begining of pragram 
starts
+static LogLevel currentLogLevel =
+LogLevel_INFO;// Global variable to be set at the begining of pragram starts
 
 // ---
 // to get a specified field from the specified diag row
 // ---
 
 
-RETCODE SQL_API SQLGetDiagFieldW ( SQLSMALLINT pHandleType,
-   SQLHANDLE   pHandle,
-   SQLSMALLINT pRecNum,
-   SQLSMALLINT pFldID,
-   SQLPOINTER  pDataPtr,
-   SQLSMALLINT pDataSize,
-   SQLSMALLINT*pDataSizePtr ) {
+RETCODE SQL_API SQLGetDiagFieldW ( SQLSMALLINT pHandleType,
+   SQLHANDLE pHandle,
+   SQLSMALLINT pRecNum,
+   SQLSMALLINT pFldID,
+   SQLPOINTER pDataPtr,
+   SQLSMALLINT pDataSize,
+   SQLSMALLINT* pDataSizePtr )
+{
 __ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG,
-  "SQLGetDiagFieldW called, HandleType: %d, 
RecNum: %d, InfoType: %d, BufLen: %d", pHandleType, pRecNum, pFldID,
-  pDataSize ) );
-boolc;
-pODBCDiagdiag;
+"SQLGetDiagFieldW called, HandleType: %d, RecNum: %d, InfoType: %d, 
BufLen: %d", pHandleType, pRecNum, pFldID,
+pDataSize ) );
+bool c;
+pODBCDiag diag;
 pODBCDiagRow diagrow;
 SQLSMALLINT dummySize = 0;//used when pDataSizePtr is NULL
-
+
 if ( pDataSizePtr == NULL )
-{ pDataSizePtr =  }
-
+{
+pDataSizePtr = 
+}
+
 __CHK_HANDLE ( pHandle, pHandleType, SQL_ERROR );
 diag = _SQLGetDiagHandle ( pHandleType, pHandle );
-
-if ( !diag ) { return SQL_ERROR; }
-
+
+if ( !diag )
+{
+return SQL_ERROR;
+}
+
 // field may be in diag header
 c = FALSE;
-
+
 // check the field type - header fields
-switch ( pFldID ) {
-case SQL_DIAG_CURSOR_ROW_COUNT:
-case SQL_DIAG_ROW_COUNT:// rows affected 
by update/insert
-if ( pHandleType == SQL_HANDLE_STMT ) {
+switch ( pFldID )
+{
+case SQL_DIAG_CURSOR_ROW_COUNT :
+case SQL_DIAG_ROW_COUNT : // rows affected by update/insert
+if ( pHandleType == SQL_HANDLE_STMT )
+{
 if ( pDataPtr )
-{ * ( ( SQLLEN* ) pDataPtr ) = ( pHandle ) ? ( ( pODBCStmt ) 
pHandle )->RowCount : 0; }
-
+{
+* ( ( SQLLEN* ) pDataPtr ) = ( pHandle ) ? ( ( pODBCStmt ) 
pHandle ) -> RowCount : 0;
+}
+
 return SQL_SUCCESS;
 }
-
+
 else
-{ return SQL_ERROR; }
-
-case SQL_DIAG_DYNAMIC_FUNCTION:
-if ( pHandleType == SQL_HANDLE_STMT ) {
-_SQLCopyWCharDataW ( diag, pDataPtr, pDataSize, pDataSizePtr, 
16, ( ( pODBCStmt ) pHandle )->Stmt,
- ( ( pODBCStmt ) pHandle )->StmtLen );
+{
+return SQL_ERROR;
+}
+
+case SQL_DIAG_DYNAMIC_FUNCTION :
+if ( pHandleType == SQL_HANDLE_STMT )
+{
+_SQLCopyWCharDataW ( diag, pDataPtr, pDataSize, pDataSizePtr, 
16, ( ( pODBCStmt ) pHandle ) -> Stmt,
+ ( ( pODBCStmt ) pHandle ) -> StmtLen );
 return SQL_SUCCESS;
 }
-
+
 else
-{ return 

[01/11] kylin git commit: KYLIN-1389 ODBC - Reformatting C++ Code

2016-02-01 Thread lidong
Repository: kylin
Updated Branches:
  refs/heads/2.x-staging 9b19b69f1 -> 3c2329dc1


http://git-wip-us.apache.org/repos/asf/kylin/blob/3c2329dc/odbc/TestDLL/CompareQueryTests.cpp
--
diff --git a/odbc/TestDLL/CompareQueryTests.cpp 
b/odbc/TestDLL/CompareQueryTests.cpp
index c7788a2..87d6875 100644
--- a/odbc/TestDLL/CompareQueryTests.cpp
+++ b/odbc/TestDLL/CompareQueryTests.cpp
@@ -41,37 +41,39 @@
 }
 
 // -- structure ---
-typedef struct BindColInfo {
-SQLSMALLINT iColTitleSize;  // size of column title
-wchar_t*szColTitle; // column title
-SQLLEN  iColDisplaySize;// size to display
-void*   szColData;  // display buffer
-int iType;
-boolisSigned;
-SQLLEN  indPtr; // size or null indicator
-BOOLfChar;  // character col flag
-struct BindColInfo* next;   // linked list
+typedef struct BindColInfo
+{
+SQLSMALLINT iColTitleSize; // size of column title
+wchar_t* szColTitle; // column title
+SQLLEN iColDisplaySize; // size to display
+void* szColData; // display buffer
+int iType;
+bool isSigned;
+SQLLEN indPtr; // size or null indicator
+BOOL fChar; // character col flag
+struct BindColInfo* next; // linked list
 } BIND_COL_INFO;
 
 // -- function prototypes -
-voidShowDiagMessages ( SQLSMALLINT hType, SQLHANDLE hValue, SQLRETURN 
iStatus, char* szMsg );
+void ShowDiagMessages ( SQLSMALLINT hType, SQLHANDLE hValue, SQLRETURN 
iStatus, char* szMsg );
 
-SQLRETURN   CheckResults ( HSTMT hStmt , wchar_t* sql );
-voidFreeBindings ( BIND_COL_INFO* pBindColInfo );
+SQLRETURN CheckResults ( HSTMT hStmt, wchar_t* sql );
+void FreeBindings ( BIND_COL_INFO* pBindColInfo );
 
 int totalCount;
 int successCount;
 int failCount;
-std::vector failedQueries;
+std::vector  failedQueries;
 
-void validateOneQuery ( wchar_t* sql ) {
+void validateOneQuery ( wchar_t* sql )
+{
 Sleep ( 1000 );
-SQLRETURN   status;
-SQLHANDLE   hEnv = 0;
-SQLHANDLE   hConn = 0;
-SQLHANDLE   hStmt = 0;
+SQLRETURN status;
+SQLHANDLE hEnv = 0;
+SQLHANDLE hConn = 0;
+SQLHANDLE hStmt = 0;
 wchar_t szConnStrOut[1024];
-SQLSMALLINT x;
+SQLSMALLINT x;
 // show query to be executed
 wprintf ( L"The query being validated: %ls \n", sql );
 // BEFORE U CONNECT
@@ -80,27 +82,27 @@ void validateOneQuery ( wchar_t* sql ) {
 // check for error
 ODBC_CHK_ERROR ( SQL_HANDLE_ENV, hEnv, status, "" );
 // set the ODBC version for behaviour expected
-status = SQLSetEnvAttr ( hEnv,  SQL_ATTR_ODBC_VERSION, ( SQLPOINTER ) 
SQL_OV_ODBC3, 0 );
+status = SQLSetEnvAttr ( hEnv, SQL_ATTR_ODBC_VERSION, ( SQLPOINTER ) 
SQL_OV_ODBC3, 0 );
 // check for error
 ODBC_CHK_ERROR ( SQL_HANDLE_ENV, hEnv, status, "" );
 // allocate CONNECTION
 status = SQLAllocHandle ( SQL_HANDLE_DBC, hEnv,  );
 // check for error
 ODBC_CHK_ERROR ( SQL_HANDLE_ENV, hEnv, status, "" );
-#ifdef  _WIN64
+#ifdef _WIN64
 // --- real connection takes place at this point
 // --- option 1: user is prompted for DSN & options
 status = SQLDriverConnect ( hConn, GetDesktopWindow(),
 ( unsigned char* ) "",
 SQL_NTS, szConnStrOut, 1024, ,
 SQL_DRIVER_COMPLETE );
-#else
-status = SQLDriverConnectW ( hConn , GetDesktopWindow(),
+#else
+status = SQLDriverConnectW ( hConn, GetDesktopWindow (),
  //L"DSN=testDSN;",
  
L"DRIVER={KylinODBCDriver};PROJECT=default;UID=ADMIN;SERVER=http://localhost;PORT=80;;,
  SQL_NTS, szConnStrOut, 1024, ,
  SQL_DRIVER_COMPLETE );
-#endif
+#endif
 // check for error
 ODBC_CHK_ERROR ( SQL_HANDLE_DBC, hConn, status, "" );
 // CONGRATUALTIONS  u r connected to a DBMS via an ODBC driver
@@ -117,199 +119,245 @@ void validateOneQuery ( wchar_t* sql ) {
 // show the full results row by row
 status = CheckResults ( hStmt, sql );
 totalCount++;
-
-if ( status == SQL_ERROR ) {
-setPrintColorRED();
+
+if ( status == SQL_ERROR )
+{
+setPrintColorRED ();
 fputs ( "[FAIL]\n", stdout );
-resetPrintColor();
+resetPrintColor ();
 failCount++;
-failedQueries.push_back ( sql );
+failedQueries . push_back ( sql );
 }
-
-else if ( status == SQL_SUCCESS ) {
-setPrintColorGreen();
+
+else if ( status == SQL_SUCCESS )

[02/11] kylin git commit: KYLIN-1389 ODBC - Reformatting C++ Code

2016-02-01 Thread lidong
http://git-wip-us.apache.org/repos/asf/kylin/blob/3c2329dc/odbc/Driver/KO_PARAM.CPP
--
diff --git a/odbc/Driver/KO_PARAM.CPP b/odbc/Driver/KO_PARAM.CPP
index 9bbe14c..e05efce 100644
--- a/odbc/Driver/KO_PARAM.CPP
+++ b/odbc/Driver/KO_PARAM.CPP
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 
 // 
 //
@@ -38,38 +38,38 @@
 #include "stdafx.h"
 
 
-
 // ---
 // to bind a buffer to a parameter marker in an SQL statement
 // ---
 
-RETCODE SQL_API SQLBindParameter ( SQLHSTMTpStmt,
-   SQLUSMALLINTpParamNum,
-   SQLSMALLINT pIOType,
-   SQLSMALLINT pValueType,
-   SQLSMALLINT pParamType,
-   SQLUINTEGER pColSize,
-   SQLSMALLINT pDecimalDigits,
-   SQLPOINTER  pParamValuePtr,
-   SQLINTEGER  pParamValueSize,
-   SQLINTEGER* pParamValueSizePtr ) {
+RETCODE SQL_API SQLBindParameter ( SQLHSTMT pStmt,
+   SQLUSMALLINT pParamNum,
+   SQLSMALLINT pIOType,
+   SQLSMALLINT pValueType,
+   SQLSMALLINT pParamType,
+   SQLUINTEGER pColSize,
+   SQLSMALLINT pDecimalDigits,
+   SQLPOINTER pParamValuePtr,
+   SQLINTEGER pParamValueSize,
+   SQLINTEGER* pParamValueSizePtr )
+{
 __ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "SQLBindParameter called" ) );
 __ODBCPOPMSG ( _ODBCPopMsg ( "SQLBindParameter not implemented" ) );
 return SQL_ERROR;
 }
 
 
-
 // ---
 // to get param descriptions for a specified bound param
 // ---
 
-RETCODE SQL_API SQLDescribeParam ( SQLHSTMTpStmt,
-   SQLUSMALLINTpParamNum,
-   SQLSMALLINT*pDataTypePtr,
-   SQLUINTEGER*pParamSizePtr,
-   SQLSMALLINT*pDecimalDigitsPtr,
-   SQLSMALLINT*pNullablePtr ) {
+RETCODE SQL_API SQLDescribeParam ( SQLHSTMT pStmt,
+   SQLUSMALLINT pParamNum,
+   SQLSMALLINT* pDataTypePtr,
+   SQLUINTEGER* pParamSizePtr,
+   SQLSMALLINT* pDecimalDigitsPtr,
+   SQLSMALLINT* pNullablePtr )
+{
 __ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "SQLDescribeParam called" ) );
 __ODBCPOPMSG ( _ODBCPopMsg ( "SQLDescribeParam not implemented" ) );
 return SQL_ERROR;
@@ -80,15 +80,18 @@ RETCODE SQL_API SQLDescribeParam ( SQLHSTMTpStmt,
 // to get the number of parameters in a statement
 // ---
 
-RETCODE SQL_API SQLNumParams ( SQLHSTMT pStmt, SQLSMALLINT* pParamCountPtr ) {
+RETCODE SQL_API SQLNumParams ( SQLHSTMT pStmt, SQLSMALLINT* pParamCountPtr )
+{
 // since the concept of parameters has not been implemented
 // this function returns zero in the number of params to
 // make sure that the calle does not proceed forward on this issue
 __ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "SQLNumParams called" ) );
-
+
 if ( pParamCountPtr )
-{ *pParamCountPtr = 0; }
-
+{
+*pParamCountPtr = 0;
+}
+
 return SQL_SUCCESS;
 }
 
@@ -96,8 +99,10 @@ RETCODE SQL_API SQLNumParams ( SQLHSTMT pStmt, SQLSMALLINT* 
pParamCountPtr ) {
 // to be used wth SQLPutData to provide param data at execution time
 // ---
 
-RETCODE SQL_API SQLParamData ( SQLHSTMT pStmt, SQLPOINTER* pValuePtrPtr ) {
+RETCODE SQL_API SQLParamData ( SQLHSTMT pStmt, SQLPOINTER* pValuePtrPtr )
+{
 __ODBCLOG ( _ODBCLogMsg ( LogLevel_DEBUG, "SQLParamData called" ) );
 __ODBCPOPMSG ( _ODBCPopMsg ( "SQLParamData not implemented" ) );
 return SQL_ERROR;
 }
+

http://git-wip-us.apache.org/repos/asf/kylin/blob/3c2329dc/odbc/Driver/KO_UTILS.CPP
--
diff --git a/odbc/Driver/KO_UTILS.CPP b/odbc/Driver/KO_UTILS.CPP
index 

[04/11] kylin git commit: KYLIN-1389 ODBC - Reformatting C++ Code

2016-02-01 Thread lidong
http://git-wip-us.apache.org/repos/asf/kylin/blob/3c2329dc/odbc/Driver/KO_FETCH.CPP
--
diff --git a/odbc/Driver/KO_FETCH.CPP b/odbc/Driver/KO_FETCH.CPP
index 39f0915..880ed10 100644
--- a/odbc/Driver/KO_FETCH.CPP
+++ b/odbc/Driver/KO_FETCH.CPP
@@ -1,4 +1,4 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
+
 
 // 
 //
@@ -87,14 +87,14 @@
 #include "Dump.h"
 
 // - local functions -
-RETCODE SQL_API _SQLFetch ( pODBCStmt pStmt, Word pFetchOrientation, Long 
pFetchOffset, ULong* pRowCountPtr,
-UWord* pRowStatusArray );
-RETCODE SQL_API _SQLColConvert ( pODBCStmt pStmt, void* pTgtDataPtr, Long* 
pTgtDataSizePtr, CStrPtr pSrcColData,
- pARDItem pARDCol , bool isSigned );
-RETCODE SQL_API _SQLFetchMoveNext ( pODBCStmt pStmt );
-RETCODE SQL_API _SQLResetRowPos ( pODBCStmt pStmt );
+RETCODE SQL_API _SQLFetch ( pODBCStmt pStmt, Word pFetchOrientation, Long 
pFetchOffset, ULong* pRowCountPtr,
+UWord* pRowStatusArray );
+RETCODE SQL_API _SQLColConvert ( pODBCStmt pStmt, void* pTgtDataPtr, Long* 
pTgtDataSizePtr, CStrPtr pSrcColData,
+ pARDItem pARDCol, bool isSigned );
+RETCODE SQL_API _SQLFetchMoveNext ( pODBCStmt pStmt );
+RETCODE SQL_API _SQLResetRowPos ( pODBCStmt pStmt );
 
-SQLRowContent* GetIfExist ( std::vector& container, int index 
);
+SQLRowContent* GetIfExist ( std::vector & container, int index 
);
 
 // ---
 // to get specific detail//attribute about a col returned from server --- FROM 
IRD
@@ -102,128 +102,141 @@ SQLRowContent* GetIfExist ( 
std::vector& container, int index );
 // ---
 
 
-RETCODE  _SQLColAttribute_basic ( SQLHSTMTpStmt,
-  SQLUSMALLINTpColNum,
-  SQLUSMALLINTpFldID,
-  SQLPOINTER  pDataPtr,
-  SQLSMALLINT pDataSize,
-  SQLSMALLINT*pDataSizePtr, // in bytes
-  SQLPOINTER  pNumValuePtr ,// integer
-  bool isANSI
-) { //if returned data is numeric, feed this
-Longn;
-SQLResponse*ird;
-pIRDItemcol;
+RETCODE _SQLColAttribute_basic ( SQLHSTMT pStmt,
+ SQLUSMALLINT pColNum,
+ SQLUSMALLINT pFldID,
+ SQLPOINTER pDataPtr,
+ SQLSMALLINT pDataSize,
+ SQLSMALLINT* pDataSizePtr, // in bytes
+ SQLPOINTER pNumValuePtr,// integer
+ bool isANSI
+)
+{ //if returned data is numeric, feed this
+Long n;
+SQLResponse* ird;
+pIRDItem col;
 __CHK_HANDLE ( pStmt, SQL_HANDLE_STMT, SQL_ERROR );
 // free diags
 _SQLFreeDiag ( _DIAGSTMT ( pStmt ) );
-
+
 // precaution
-if ( pColNum == 0 ) {
+if ( pColNum == 0 )
+{
 _SQLPutDiagRow ( SQL_HANDLE_STMT, pStmt, "SQLColAttribute", "01000", 
-1, "bad params" );
 return SQL_ERROR;
 }
-
+
 // get the row descriptor obtained with response
-ird = ( ( ( pODBCStmt ) pStmt )->IRD ).RowDesc.get();
-
+ird = ( ( ( pODBCStmt ) pStmt ) -> IRD ) . RowDesc . get ();
+
 // check
-if ( ird == NULL ) {
+if ( ird == NULL )
+{
 _SQLPutDiagRow ( SQL_HANDLE_STMT, pStmt, "SQLColAttribute", "01000", 
-1, "No resultset or no col descriptors" );
 return SQL_ERROR;
 }
-
+
 // find the xth element/col
-col = _SQLGetIRDItem ( & ( ( ( pODBCStmt ) pStmt )->IRD ), pColNum );
-
+col = _SQLGetIRDItem ( & ( ( ( pODBCStmt ) pStmt ) -> IRD ), pColNum );
+
 // check
-if ( col == NULL ) {
+if ( col == NULL )
+{
 _SQLPutDiagRow ( SQL_HANDLE_STMT, pStmt, "SQLColAttribute", "01000", 
-1, "Invalid col num" );
 return SQL_ERROR;
 }
-
+
 // get value from descriptor as per field type
-switch ( pFldID ) {
-// numeric types clubbed together
-case SQL_DESC_AUTO_UNIQUE_VALUE:// is col 
auto-incrementing
-case SQL_DESC_CASE_SENSITIVE:   // is col 

[06/11] kylin git commit: KYLIN-1389 ODBC - Reformatting C++ Code

2016-02-01 Thread lidong
http://git-wip-us.apache.org/repos/asf/kylin/blob/3c2329dc/odbc/Driver/KO_DESC.CPP
--
diff --git a/odbc/Driver/KO_DESC.CPP b/odbc/Driver/KO_DESC.CPP
index b72deab..7aa6ed0 100644
--- a/odbc/Driver/KO_DESC.CPP
+++ b/odbc/Driver/KO_DESC.CPP
@@ -1,4 +1,4 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -15,8 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- 
- 
+
 
 // 
 //
@@ -60,119 +59,123 @@
 
 
 //  local functions ---
-pAPDItem _SQLGetAPDItem ( const pODBCAPD pDesc, Word pRecNum );
-pIPDItem _SQLGetIPDItem ( const pODBCIPD pDesc, Word pRecNum );
-pARDItem _SQLGetARDItem ( const pODBCARD pDesc, Word pRecNum );
-pIRDItem _SQLGetIRDItem ( const pODBCIRD pDesc, Word pRecNum );
-
-eGoodBad_SQLSetAPDFieldsDefault ( pODBCAPD pDesc, const pODBCStmt 
pStmt );
-eGoodBad_SQLSetAPDItemFieldsDefault ( pAPDItem pDescItem );
-
-eGoodBad_SQLSetIPDFieldsDefault ( pODBCIPD pDesc, const pODBCStmt 
pStmt );
-eGoodBad_SQLSetIPDItemFieldsDefault ( pIPDItem pDescItem );
-
-eGoodBad_SQLSetARDFieldsDefault ( pODBCARD pDesc, const pODBCStmt 
pStmt );
-eGoodBad_SQLSetARDItemFieldsDefault ( pARDItem pDescItem, Word 
pRecNum );
-
-eGoodBad_SQLSetIRDFieldsDefault ( pODBCIRD pDesc, const pODBCStmt 
pStmt );
-eGoodBad_SQLSetIRDItemFieldsDefault ( pIRDItem pDescItem );
-
-RETCODE SQL_API _SQLSetAPDField ( pODBCAPD pDesc, Word pFldID, const void* 
pDataPtr, Long pDataSize );
-RETCODE SQL_API _SQLSetAPDItemField ( pODBCAPD pDesc, pAPDItem pDescItem, 
Word pRecNum, Word pFldID,
-  const void* pDataPtr, Long pDataSize 
);
-RETCODE SQL_API _SQLGetAPDField ( const pODBCAPD pDesc, Word pFldID, void* 
pDataPtr, Long pDataSize,
-  Long* pDataSizePtr );
-RETCODE SQL_API _SQLGetAPDItemField ( const pODBCAPD pDesc, const pAPDItem 
pDescItem, Word pRecNum,
-  Word pFldID, void* pDataPtr, Long 
pDataSize, Long* pDataSizePtr );
-
-RETCODE SQL_API _SQLSetIPDField ( pODBCIPD pDesc, Word pFldID, const void* 
pDataPtr, Long pDataSize );
-RETCODE SQL_API _SQLSetIPDItemField ( pODBCIPD pDesc, pIPDItem pDescItem, 
Word pRecNum, Word pFldID,
-  const void* pDataPtr, Long pDataSize 
);
-RETCODE SQL_API _SQLGetIPDField ( const pODBCIPD pDesc, Word pFldID, void* 
pDataPtr, Long pDataSize,
-  Long* pDataSizePtr );
-RETCODE SQL_API _SQLGetIPDItemField ( const pODBCIPD pDesc, const pIPDItem 
pDescItem, Word pRecNum,
-  Word pFldID, void* pDataPtr, Long 
pDataSize, Long* pDataSizePtr );
-
-RETCODE SQL_API _SQLSetARDField ( pODBCARD pDesc, Word pFldID, const void* 
pDataPtr, Long pDataSize );
-RETCODE SQL_API _SQLSetARDItemField ( pODBCARD pDesc, pARDItem pDescItem, 
Word pRecNum, Word pFldID,
-  const void* pDataPtr, Long pDataSize 
);
-RETCODE SQL_API _SQLGetARDField ( const pODBCARD pDesc, Word pFldID, void* 
pDataPtr, Long pDataSize,
-  Long* pDataSizePtr );
-RETCODE SQL_API _SQLGetARDItemField ( const pODBCARD pDesc, const pARDItem 
pDescItem, Word pRecNum,
-  Word pFldID, void* pDataPtr, Long 
pDataSize, Long* pDataSizePtr );
-
-RETCODE SQL_API _SQLSetIRDField ( pODBCIRD pDesc, Word pFldID, const void* 
pDataPtr, Long pDataSize );
-RETCODE SQL_API _SQLSetIRDItemField ( pODBCIRD pDesc, pIRDItem pDescItem, 
Word pRecNum, Word pFldID,
-  const void* pDataPtr, Long pDataSize 
);
-RETCODE SQL_API _SQLGetIRDField ( const pODBCIRD pDesc, Word pFldID, void* 
pDataPtr, Long pDataSize,
-  Long* pDataSizePtr );
-RETCODE SQL_API _SQLGetIRDItemField ( const pODBCIRD pDesc, const pIRDItem 
pDescItem, Word pRecNum,
-  Word pFldID, void* pDataPtr, Long 
pDataSize, Long* pDataSizePtr , bool isANSI );
-
-RETCODE SQL_API _SQLFreeAPDContent ( const pODBCAPD pDesc );
-RETCODE SQL_API _SQLFreeIPDContent ( const pODBCIPD pDesc );
-RETCODE SQL_API _SQLFreeARDContent ( const pODBCARD pDesc );
-RETCODE SQL_API _SQLFreeIRDContent ( const pODBCIRD pDesc );
-
-eGoodBad_SQLAttachARDItem ( pODBCARD pDesc, pARDItem pDescItem );
-eGoodBad_SQLDetachARDItem ( pODBCARD pDesc, pARDItem pDescItem );
+pAPDItem 

kylin git commit: minor, update documents on jekyll installation

2016-02-01 Thread lidong
Repository: kylin
Updated Branches:
  refs/heads/1.x-staging 555a2e566 -> b507b44f2


minor, update documents on jekyll installation


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

Branch: refs/heads/1.x-staging
Commit: b507b44f25b3887489f31bfd81da26617fafbb51
Parents: 555a2e5
Author: dongli 
Authored: Mon Feb 1 22:13:00 2016 +0800
Committer: dongli 
Committed: Mon Feb 1 22:13:00 2016 +0800

--
 website/_dev/howto_docs.md | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/b507b44f/website/_dev/howto_docs.md
--
diff --git a/website/_dev/howto_docs.md b/website/_dev/howto_docs.md
index 3eca761..4850750 100644
--- a/website/_dev/howto_docs.md
+++ b/website/_dev/howto_docs.md
@@ -17,6 +17,7 @@ Install following tools before you add or edit documentation:
 2. Then, install [Jekyll](http://jekyllrb.com), and required plugins
* `gem install jekyll jekyll-multiple-languages kramdown rouge`  
* __Note__: Some specific version of jekyll and 
jekyll-multiple-languages does not work together (I got a "undefined method" 
error with jekyll 3.0.1 and jekyll-multiple-languages 2.0.3). In that case, 
`jekyll 2.5.3` and `jekyll-multiple-languages 1.0.8` is the known working 
version.
+* eg. Use `gem install jekyll --version "=2.5.3"` to install a 
specific version.

 3. And optionally any markdown editor you prefer
 



kylin git commit: KYLIN-1313 fix CI

2016-02-01 Thread mahongbin
Repository: kylin
Updated Branches:
  refs/heads/2.x-staging 82c6d588f -> 54e491502


KYLIN-1313 fix CI


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

Branch: refs/heads/2.x-staging
Commit: 54e491502fb00b88fbabe0dcbc32aea91dc874e3
Parents: 82c6d58
Author: honma 
Authored: Mon Feb 1 22:14:41 2016 +0800
Committer: honma 
Committed: Mon Feb 1 22:14:41 2016 +0800

--
 .../measure/extendedcolumn/ExtendedColumnSerializerTest.java   | 6 +++---
 examples/test_case_data/sandbox/kylin.properties   | 2 +-
 .../src/test/java/org/apache/kylin/query/ITKylinQueryTest.java | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/54e49150/core-metadata/src/test/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnSerializerTest.java
--
diff --git 
a/core-metadata/src/test/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnSerializerTest.java
 
b/core-metadata/src/test/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnSerializerTest.java
index dd73369..fed1c28 100644
--- 
a/core-metadata/src/test/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnSerializerTest.java
+++ 
b/core-metadata/src/test/java/org/apache/kylin/measure/extendedcolumn/ExtendedColumnSerializerTest.java
@@ -39,7 +39,7 @@ public class ExtendedColumnSerializerTest {
 public void testSerDesNull() {
 ExtendedColumnSerializer serializer = new 
ExtendedColumnSerializer(DataType.getType("extendedcolumn(20)"));
 MeasureIngester ingester = measureType.newIngester();
-ByteArray array = ingester.valueOf(new String[] { null }, null, null);
+ByteArray array = ingester.valueOf(new String[] { null, null }, null, 
null);
 Assert.assertTrue(new ByteArray().equals(array));
 
 ByteBuffer buffer = ByteBuffer.allocate(serializer.maxLength());
@@ -57,7 +57,7 @@ public class ExtendedColumnSerializerTest {
 
 ExtendedColumnSerializer serializer = new 
ExtendedColumnSerializer(DataType.getType("extendedcolumn(20)"));
 MeasureIngester ingester = measureType.newIngester();
-ByteArray array = ingester.valueOf(new String[] { text }, null, null);
+ByteArray array = ingester.valueOf(new String[] { null, text }, null, 
null);
 
 ByteBuffer buffer = ByteBuffer.allocate(serializer.maxLength());
 serializer.serialize(array, buffer);
@@ -71,7 +71,7 @@ public class ExtendedColumnSerializerTest {
 String text = StringUtils.repeat("h", 21);
 ExtendedColumnSerializer serializer = new 
ExtendedColumnSerializer(DataType.getType("extendedcolumn(20)"));
 MeasureIngester ingester = measureType.newIngester();
-ByteArray array = ingester.valueOf(new String[] { text }, null, null);
+ByteArray array = ingester.valueOf(new String[] { null, text }, null, 
null);
 
 ByteBuffer buffer = ByteBuffer.allocate(serializer.maxLength());
 serializer.serialize(array, buffer);

http://git-wip-us.apache.org/repos/asf/kylin/blob/54e49150/examples/test_case_data/sandbox/kylin.properties
--
diff --git a/examples/test_case_data/sandbox/kylin.properties 
b/examples/test_case_data/sandbox/kylin.properties
index ccdc3a1..bf161fc 100644
--- a/examples/test_case_data/sandbox/kylin.properties
+++ b/examples/test_case_data/sandbox/kylin.properties
@@ -24,7 +24,7 @@ kylin.job.mapreduce.default.reduce.input.mb=500
 
 # If true, job engine will not assume that hadoop CLI reside on the same 
server as it self
 # you will have to specify kylin.job.remote.cli.hostname, 
kylin.job.remote.cli.username and kylin.job.remote.cli.password
-kylin.job.run.as.remote.cmd=true
+kylin.job.run.as.remote.cmd=false
 
 # Only necessary when kylin.job.run.as.remote.cmd=true
 kylin.job.remote.cli.hostname=sandbox

http://git-wip-us.apache.org/repos/asf/kylin/blob/54e49150/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java
--
diff --git 
a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java 
b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java
index 89a9740..fa71db2 100644
--- a/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/query/ITKylinQueryTest.java
@@ -45,7 +45,7 @@ public class ITKylinQueryTest extends KylinTestBase {
 
 @BeforeClass
 public static void setUp() throws Exception {
-

[2/3] kylin git commit: KYLIN-1286 Add missing license header

2016-02-01 Thread lidong
http://git-wip-us.apache.org/repos/asf/kylin/blob/cf2aebe4/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java
index 1420470..1f4ef16 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/StreamSQLDigest.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.kylin.metadata.realization;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/kylin/blob/cf2aebe4/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/CompoundTupleIterator.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/CompoundTupleIterator.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/CompoundTupleIterator.java
index 02af3ca..fdbd25d 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/CompoundTupleIterator.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/CompoundTupleIterator.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.kylin.metadata.tuple;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/kylin/blob/cf2aebe4/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/IEvaluatableTuple.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/IEvaluatableTuple.java
 
b/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/IEvaluatableTuple.java
index d5a5061..b29de7f 100644
--- 
a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/IEvaluatableTuple.java
+++ 
b/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/IEvaluatableTuple.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.kylin.metadata.tuple;
 
 import org.apache.kylin.metadata.model.TblColRef;

http://git-wip-us.apache.org/repos/asf/kylin/blob/cf2aebe4/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/SimpleTupleIterator.java
--
diff --git 
a/core-metadata/src/main/java/org/apache/kylin/metadata/tuple/SimpleTupleIterator.java
 

[3/3] kylin git commit: KYLIN-1286 Add missing license header

2016-02-01 Thread lidong
KYLIN-1286 Add missing license header


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

Branch: refs/heads/2.0-rc
Commit: cf2aebe45594a8cbd7ecdcb2fbcf239218c1311e
Parents: d3250ac
Author: lidongsjtu 
Authored: Tue Feb 2 14:17:07 2016 +0800
Committer: lidongsjtu 
Committed: Tue Feb 2 14:17:07 2016 +0800

--
 .../kylin/job/hadoop/invertedindex/IITest.java| 18 ++
 .../kylin/job/streaming/KafkaDataLoader.java  | 18 ++
 .../streaming/StreamingTableDataGenerator.java| 18 ++
 .../kylin/common/persistence/RawResource.java | 18 ++
 .../apache/kylin/common/util/Log4jConfigurer.java | 18 ++
 .../org/apache/kylin/common/util/RangeUtil.java   | 18 ++
 .../org/apache/kylin/common/util/SortUtil.java| 18 ++
 .../kylin/common/util/StreamingMessage.java   | 18 ++
 .../org/apache/kylin/common/util/TimeUtil.java| 18 ++
 .../kylin/common/util/ITMockHTableTest.java   | 18 ++
 .../kylin/common/util/IdentityUtilTest.java   | 18 ++
 .../org/apache/kylin/common/util/RangeTest.java   | 18 ++
 .../apache/kylin/common/util/RangeUtilTest.java   | 18 ++
 .../apache/kylin/common/util/TimeUtilTest.java| 18 ++
 .../kylin/cube/gridtable/CubeCodeSystem.java  | 18 ++
 .../kylin/cube/gridtable/CubeGridTable.java   | 18 ++
 .../cube/gridtable/CuboidToGridTableMapping.java  | 18 ++
 .../kylin/cube/inmemcubing/CuboidResult.java  | 18 ++
 .../kylin/cube/model/CubeJoinedFlatTableDesc.java | 18 ++
 .../kylin/gridtable/DefaultGTComparator.java  | 18 ++
 .../kylin/gridtable/GTAggregateScanner.java   | 18 ++
 .../org/apache/kylin/gridtable/GTBuilder.java | 18 ++
 .../apache/kylin/gridtable/GTFilterScanner.java   | 18 ++
 .../java/org/apache/kylin/gridtable/GTInfo.java   | 18 ++
 .../apache/kylin/gridtable/GTInvertedIndex.java   | 18 ++
 .../kylin/gridtable/GTInvertedIndexOfColumn.java  | 18 ++
 .../java/org/apache/kylin/gridtable/GTRecord.java | 18 ++
 .../org/apache/kylin/gridtable/GTRowBlock.java| 18 ++
 .../kylin/gridtable/GTSampleCodeSystem.java   | 18 ++
 .../org/apache/kylin/gridtable/GTScanRange.java   | 18 ++
 .../kylin/gridtable/GTScanRangePlanner.java   | 18 ++
 .../org/apache/kylin/gridtable/GTScanRequest.java | 18 ++
 .../java/org/apache/kylin/gridtable/GTUtil.java   | 18 ++
 .../org/apache/kylin/gridtable/GridTable.java | 18 ++
 .../org/apache/kylin/gridtable/IGTCodeSystem.java | 18 ++
 .../org/apache/kylin/gridtable/IGTComparator.java | 18 ++
 .../org/apache/kylin/gridtable/IGTScanner.java| 18 ++
 .../java/org/apache/kylin/gridtable/IGTStore.java | 18 ++
 .../org/apache/kylin/gridtable/IGTWriter.java | 18 ++
 .../gridtable/memstore/GTSimpleMemStore.java  | 18 ++
 .../org/apache/kylin/dict/DictCodeSystem.java | 18 ++
 .../apache/kylin/dict/DictionarySerializer.java   | 18 ++
 .../kylin/dict/DistinctColumnValuesProvider.java  | 18 ++
 .../org/apache/kylin/dict/TimeStrDictionary.java  | 18 ++
 .../org/apache/kylin/dict/lookup/SnapshotCLI.java | 18 ++
 .../apache/kylin/dict/TimeStrDictionaryTests.java | 18 ++
 .../kylin/engine/IStreamingCubingEngine.java  | 18 ++
 .../java/org/apache/kylin/job/lock/JobLock.java   | 18 ++
 .../org/apache/kylin/job/lock/MockJobLock.java| 18 ++
 .../org/apache/kylin/job/BasicLocalMetaTest.java  | 18 ++
 .../measure/serializer/DateTimeSerializer.java| 18 ++
 .../measure/serializer/StringSerializer.java  | 18 ++
 .../metadata/realization/IRealizationSegment.java | 18 ++
 .../kylin/metadata/realization/SQLDigestUtil.java | 18 ++
 .../metadata/realization/StreamSQLDigest.java | 18 ++
 .../metadata/tuple/CompoundTupleIterator.java | 18 ++
 .../kylin/metadata/tuple/IEvaluatableTuple.java   | 18 ++
 .../kylin/metadata/tuple/SimpleTupleIterator.java | 18 ++
 

[1/3] kylin git commit: KYLIN-1286 Add missing license header

2016-02-01 Thread lidong
Repository: kylin
Updated Branches:
  refs/heads/2.0-rc d3250acf3 -> cf2aebe45


http://git-wip-us.apache.org/repos/asf/kylin/blob/cf2aebe4/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
index 61bea36..06dc36b 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHTableUtil.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.kylin.storage.hbase.steps;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/kylin/blob/cf2aebe4/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
index c3bd7b5..1ab14b4 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.kylin.storage.hbase.steps;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/kylin/blob/cf2aebe4/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
index e56e2ea..16bb3c5 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/KeyValueCreator.java
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.apache.kylin.storage.hbase.steps;
 
 import java.nio.ByteBuffer;

http://git-wip-us.apache.org/repos/asf/kylin/blob/cf2aebe4/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/HbaseStreamingInput.java
--
diff --git