You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/11/05 02:54:35 UTC
[21/31] incubator-kylin git commit: KYLIN-1115 Clean up ODBC driver
code
KYLIN-1115 Clean up ODBC driver code
Signed-off-by: honma <ho...@ebay.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/4e161aac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/4e161aac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/4e161aac
Branch: refs/heads/KYLIN-1112
Commit: 4e161aac64a8947e88246ef78f1f29a679193fe8
Parents: 584f24e
Author: lidongsjtu <do...@ebay.com>
Authored: Fri Oct 30 17:05:45 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Thu Nov 5 09:53:17 2015 +0800
----------------------------------------------------------------------
odbc/.gitignore | 13 +-
odbc/Common/Common.vcxproj | 18 ++
odbc/Common/Common.vcxproj.filters | 19 ++
odbc/Common/Common.vcxproj.user | 19 ++
odbc/Common/Gzip.cpp | 1 -
odbc/Common/ReadMe.txt | 18 ++
odbc/Driver/GODBC.RC | 18 ++
odbc/Driver/driver.DEF | 17 ++
odbc/Driver/driver.dsp | 247 -------------------
odbc/Driver/driver.vcxproj | 19 ++
odbc/Driver/driver.vcxproj.filters | 19 ++
odbc/Driver/driver.vcxproj.user | 19 ++
odbc/Driver/version.props | 19 ++
odbc/Installer(64bit)/Installer(64bit).isl | 12 +-
odbc/Installer(64bit)/Installer(64bit).isproj | 17 ++
.../Installer(64bit)/Express/Interm/.gitignore | 1 -
.../Express/SingleImage/LogFiles/.gitignore | 1 -
.../Express/SingleImage/Reports/.gitignore | 1 -
odbc/Installer/Installer.isl | 12 +-
odbc/Installer/Installer.isproj | 17 ++
.../Installer/Express/Interm/.gitignore | 1 -
.../Express/SingleImage/LogFiles/.gitignore | 1 -
.../Express/SingleImage/Reports/.gitignore | 1 -
odbc/KylinODBC.sln | 18 +-
odbc/README.md | 2 +-
odbc/TestDLL/ColorPrint.cpp | 2 +-
odbc/TestDLL/ColorPrint.h | 2 +-
odbc/TestDLL/CompareQueryTests.cpp | 66 ++++-
odbc/TestDLL/Report.cpp | 2 +-
odbc/TestDLL/RestAPITest.cpp | 2 +-
odbc/TestDLL/SimpleQueryTest.cpp | 2 +-
odbc/TestDLL/Source.cpp | 5 +-
odbc/TestDLL/TestDLL.vcxproj | 20 ++
odbc/TestDLL/TestDLL.vcxproj.filters | 19 ++
odbc/TestDLL/TestDLL.vcxproj.user | 19 ++
odbc/TestDLL/Tests.h | 3 +-
odbc/TestDLL/testqueries.txt | 22 +-
odbc/doc/reference/ODBC Driver Development.docx | Bin 238372 -> 0 bytes
... driver based on REST service (chinese).docx | Bin 681289 -> 0 bytes
39 files changed, 409 insertions(+), 285 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/.gitignore b/odbc/.gitignore
index a8209c6..2af835b 100644
--- a/odbc/.gitignore
+++ b/odbc/.gitignore
@@ -3,6 +3,8 @@
*.lo
*.o
*.obj
+*.idb
+*.ilk
# Precompiled Headers
*.gch
@@ -22,23 +24,26 @@
*.a
*.lib
-*.exe
-
# Executables
*.out
*.app
+*.exe
+# Temp files
*.opensdf
*.sdf
*.log
*.tlog
*.pdb
*.suo
-
-
+*.aps
/UpgradeLog.*
/_UpgradeReport_files*
/ipch*
*.unsuccessfulbuild
*.successfulbuild
*.lastbuildstate
+
+# Installer projects
+Installer/Installer/
+Installer(64bit)/Installer(64bit)/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Common/Common.vcxproj
----------------------------------------------------------------------
diff --git a/odbc/Common/Common.vcxproj b/odbc/Common/Common.vcxproj
index a133099..a9f5cc6 100644
--- a/odbc/Common/Common.vcxproj
+++ b/odbc/Common/Common.vcxproj
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Common/Common.vcxproj.filters
----------------------------------------------------------------------
diff --git a/odbc/Common/Common.vcxproj.filters b/odbc/Common/Common.vcxproj.filters
index 790f9df..e729e00 100644
--- a/odbc/Common/Common.vcxproj.filters
+++ b/odbc/Common/Common.vcxproj.filters
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Common/Common.vcxproj.user
----------------------------------------------------------------------
diff --git a/odbc/Common/Common.vcxproj.user b/odbc/Common/Common.vcxproj.user
index a375ae3..27d8ac0 100644
--- a/odbc/Common/Common.vcxproj.user
+++ b/odbc/Common/Common.vcxproj.user
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Common/Gzip.cpp
----------------------------------------------------------------------
diff --git a/odbc/Common/Gzip.cpp b/odbc/Common/Gzip.cpp
index bbfc00c..220a1b8 100644
--- a/odbc/Common/Gzip.cpp
+++ b/odbc/Common/Gzip.cpp
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Common/ReadMe.txt
----------------------------------------------------------------------
diff --git a/odbc/Common/ReadMe.txt b/odbc/Common/ReadMe.txt
index 514fbd1..aa14f76 100644
--- a/odbc/Common/ReadMe.txt
+++ b/odbc/Common/ReadMe.txt
@@ -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.
+ */
+
========================================================================
STATIC LIBRARY : Common Project Overview
========================================================================
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Driver/GODBC.RC
----------------------------------------------------------------------
diff --git a/odbc/Driver/GODBC.RC b/odbc/Driver/GODBC.RC
index 4a14c42..dd2cb3f 100644
--- a/odbc/Driver/GODBC.RC
+++ b/odbc/Driver/GODBC.RC
@@ -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.
+ */
+
// Microsoft Visual C++ generated resource script.
//
#include "resource.h"
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Driver/driver.DEF
----------------------------------------------------------------------
diff --git a/odbc/Driver/driver.DEF b/odbc/Driver/driver.DEF
index f1cf975..d0cdcdd 100644
--- a/odbc/Driver/driver.DEF
+++ b/odbc/Driver/driver.DEF
@@ -1,3 +1,20 @@
+;
+; 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.
+;
LIBRARY driver
EXPORTS
SQLAllocConnect
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Driver/driver.dsp
----------------------------------------------------------------------
diff --git a/odbc/Driver/driver.dsp b/odbc/Driver/driver.dsp
deleted file mode 100644
index 3849235..0000000
--- a/odbc/Driver/driver.dsp
+++ /dev/null
@@ -1,247 +0,0 @@
-# Microsoft Developer Studio Project File - Name="driver" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=driver - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE
-!MESSAGE NMAKE /f "driver.mak".
-!MESSAGE
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE
-!MESSAGE NMAKE /f "driver.mak" CFG="driver - Win32 Debug"
-!MESSAGE
-!MESSAGE Possible choices for configuration are:
-!MESSAGE
-!MESSAGE "driver - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "driver - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF "$(CFG)" == "driver - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "driver_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O2 /I "." /I "..\common" /I "..\common\xml" /I "..\common\sock" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "driver_EXPORTS" /D "_XML_STREAM_SOCK_CLIENT" /YX /FD /c
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 odbccp32.lib kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib mswsock.lib ws2_32.lib /nologo /dll /machine:I386
-
-!ELSEIF "$(CFG)" == "driver - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir ""
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "driver_EXPORTS" /YX /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "." /I "..\common" /I "..\common\xml" /I "..\common\sock" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "driver_EXPORTS" /D "_XML_STREAM_SOCK_CLIENT" /YX /FD /GZ /c
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib mswsock.lib ws2_32.lib /nologo /dll /incremental:no /debug /machine:I386 /pdbtype:sept
-
-!ENDIF
-
-# Begin Target
-
-# Name "driver - Win32 Release"
-# Name "driver - Win32 Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\Common\common.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_ALLOC.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_ATTR.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_CONN.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_CTLG.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_DESC.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_DIAG.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_DTYPE.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_EXEC.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_FETCH.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_INFO.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_PARAM.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_SOAP.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GO_UTILS.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\GODBC32.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=.\driver.DEF
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\SOCK\SOCK_CLI.CPP
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\XMLLEX.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\XMLNLST.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\XMLPARSE.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\XMLPHELP.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\XMLTREE.cpp
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\Common\char.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\common.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=.\GODBC.H
-# End Source File
-# Begin Source File
-
-SOURCE=.\resource.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\SOCK\SOCK_CLI.HPP
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\SOCK\SOCK_CLI.HXX
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\types.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\xmllex.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\XMLPARSE.H
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\xmlparse.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\xmlparse.hxx
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\xmltree.hpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\Common\XML\xmltree.hxx
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# Begin Source File
-
-SOURCE=.\GODBC.RC
-# End Source File
-# End Group
-# End Target
-# End Project
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Driver/driver.vcxproj
----------------------------------------------------------------------
diff --git a/odbc/Driver/driver.vcxproj b/odbc/Driver/driver.vcxproj
index bbc1c3e..0e60c0c 100644
--- a/odbc/Driver/driver.vcxproj
+++ b/odbc/Driver/driver.vcxproj
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Driver/driver.vcxproj.filters
----------------------------------------------------------------------
diff --git a/odbc/Driver/driver.vcxproj.filters b/odbc/Driver/driver.vcxproj.filters
index 5f3debd..a60e5e1 100644
--- a/odbc/Driver/driver.vcxproj.filters
+++ b/odbc/Driver/driver.vcxproj.filters
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Driver/driver.vcxproj.user
----------------------------------------------------------------------
diff --git a/odbc/Driver/driver.vcxproj.user b/odbc/Driver/driver.vcxproj.user
index a375ae3..27d8ac0 100644
--- a/odbc/Driver/driver.vcxproj.user
+++ b/odbc/Driver/driver.vcxproj.user
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Driver/version.props
----------------------------------------------------------------------
diff --git a/odbc/Driver/version.props b/odbc/Driver/version.props
index 1329bf6..ceca789 100644
--- a/odbc/Driver/version.props
+++ b/odbc/Driver/version.props
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CppRestBaseFileName>cpprest</CppRestBaseFileName>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer(64bit)/Installer(64bit).isl
----------------------------------------------------------------------
diff --git a/odbc/Installer(64bit)/Installer(64bit).isl b/odbc/Installer(64bit)/Installer(64bit).isl
index d8b25ee..e3f0bfc 100644
--- a/odbc/Installer(64bit)/Installer(64bit).isl
+++ b/odbc/Installer(64bit)/Installer(64bit).isl
@@ -1137,6 +1137,7 @@
<col def="I4">ISAttributes</col>
<col def="S255">ISFolderName</col>
<row><td>ALLUSERSPROFILE</td><td>TARGETDIR</td><td>.:ALLUSE~1|All Users</td><td/><td>0</td><td/></row>
+ <row><td>APACHE_KYLIN</td><td>ProgramFiles64Folder</td><td>APACHE~1|Apache Kylin</td><td/><td>0</td><td/></row>
<row><td>AdminToolsFolder</td><td>TARGETDIR</td><td>.:Admint~1|AdminTools</td><td/><td>0</td><td/></row>
<row><td>AppDataFolder</td><td>TARGETDIR</td><td>.:APPLIC~1|Application Data</td><td/><td>0</td><td/></row>
<row><td>CommonAppDataFolder</td><td>TARGETDIR</td><td>.:Common~1|CommonAppData</td><td/><td>0</td><td/></row>
@@ -1149,13 +1150,14 @@
<row><td>FavoritesFolder</td><td>TARGETDIR</td><td>.:FAVORI~1|Favorites</td><td/><td>0</td><td/></row>
<row><td>FontsFolder</td><td>TARGETDIR</td><td>.:Fonts</td><td/><td>0</td><td/></row>
<row><td>GlobalAssemblyCache</td><td>TARGETDIR</td><td>.:Global~1|GlobalAssemblyCache</td><td/><td>0</td><td/></row>
- <row><td>INSTALLDIR</td><td>KYLINODBCDRIVER__X64_</td><td>.</td><td/><td>0</td><td/></row>
+ <row><td>INSTALLDIR</td><td>KYLINODBCDRIVER__X64_1</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISMyCompanyDir</td><td>ProgramFilesFolder</td><td>MYCOMP~1|My Company Name</td><td/><td>0</td><td/></row>
<row><td>ISMyProductDir</td><td>ISMyCompanyDir</td><td>MYPROD~1|My Product Name</td><td/><td>0</td><td/></row>
<row><td>ISYourDataBaseDir</td><td>INSTALLDIR</td><td>Database</td><td/><td>0</td><td/></row>
<row><td>KYLINODBCDRIVER</td><td>EBAY1</td><td>KYLINO~1|KylinODBCDriver</td><td/><td>0</td><td/></row>
<row><td>KYLINODBCDRIVER__X64_</td><td>EBAY1</td><td>KYLINO~1|KylinODBCDriver (x64)</td><td/><td>0</td><td/></row>
+ <row><td>KYLINODBCDRIVER__X64_1</td><td>APACHE_KYLIN</td><td>KYLINO~1|KylinODBCDriver (x64)</td><td/><td>0</td><td/></row>
<row><td>LocalAppDataFolder</td><td>TARGETDIR</td><td>.:LocalA~1|LocalAppData</td><td/><td>0</td><td/></row>
<row><td>MY_PRODUCT_NAME</td><td>EBAY</td><td>MYPROD~1|My Product Name</td><td/><td>0</td><td/></row>
<row><td>MyPicturesFolder</td><td>TARGETDIR</td><td>.:MyPict~1|MyPictures</td><td/><td>0</td><td/></row>
@@ -2660,7 +2662,7 @@
<col def="I2">Encoded</col>
<col def="S0">Comment</col>
<col def="I4">TimeStamp</col>
- <row><td>COMPANY_NAME</td><td>1033</td><td>kylinolap</td><td>0</td><td/><td>1965175470</td></row>
+ <row><td>COMPANY_NAME</td><td>1033</td><td>Apache Kylin</td><td>0</td><td/><td>-182245712</td></row>
<row><td>DN_AlwaysInstall</td><td>1033</td><td>Always Install</td><td>0</td><td/><td>-761093519</td></row>
<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_COLOR</td><td>1033</td><td>The color settings of your system are not adequate for running [ProductName].</td><td>0</td><td/><td>-761093519</td></row>
<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_OS</td><td>1033</td><td>The operating system is not adequate for running [ProductName].</td><td>0</td><td/><td>-761093519</td></row>
@@ -3760,8 +3762,8 @@
<row><td>IDS__TargetReq_DESC_PROCESSOR</td><td>1033</td><td>The processor is not adequate for running [ProductName].</td><td>0</td><td/><td>-761093519</td></row>
<row><td>IDS__TargetReq_DESC_RAM</td><td>1033</td><td>The amount of RAM is not adequate for running [ProductName].</td><td>0</td><td/><td>-761093519</td></row>
<row><td>IDS__TargetReq_DESC_RESOLUTION</td><td>1033</td><td>The screen resolution is not adequate for running [ProductName].</td><td>0</td><td/><td>-761093519</td></row>
- <row><td>ID_STRING1</td><td>1033</td><td>http://kylin.io</td><td>0</td><td/><td>1965168496</td></row>
- <row><td>ID_STRING2</td><td>1033</td><td>kylinolap</td><td>0</td><td/><td>1965175470</td></row>
+ <row><td>ID_STRING1</td><td>1033</td><td>http://kylin.apache.org/</td><td>0</td><td/><td>-182229328</td></row>
+ <row><td>ID_STRING2</td><td>1033</td><td>Apache Kylin</td><td>0</td><td/><td>-182245712</td></row>
<row><td>IIDS_UITEXT_FeatureUninstalled</td><td>1033</td><td>This feature will remain uninstalled.</td><td>0</td><td/><td>-761093519</td></row>
</table>
@@ -4376,7 +4378,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>ProductCode</td><td>{C8B1B296-2F8B-423F-97D5-429C9B6D2AE6}</td><td/></row>
<row><td>ProductName</td><td>KylinODBCDriver (x64)</td><td/></row>
- <row><td>ProductVersion</td><td>0.7.0000</td><td/></row>
+ <row><td>ProductVersion</td><td>1.1.0000</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer(64bit)/Installer(64bit).isproj
----------------------------------------------------------------------
diff --git a/odbc/Installer(64bit)/Installer(64bit).isproj b/odbc/Installer(64bit)/Installer(64bit).isproj
index 9e4481b..7c4b2f6 100644
--- a/odbc/Installer(64bit)/Installer(64bit).isproj
+++ b/odbc/Installer(64bit)/Installer(64bit).isproj
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Select a Product Configuration -->
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer(64bit)/Installer(64bit)/Express/Interm/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Installer(64bit)/Installer(64bit)/Express/Interm/.gitignore b/odbc/Installer(64bit)/Installer(64bit)/Express/Interm/.gitignore
deleted file mode 100644
index d6fd0a4..0000000
--- a/odbc/Installer(64bit)/Installer(64bit)/Express/Interm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.Exe
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer(64bit)/Installer(64bit)/Express/SingleImage/LogFiles/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Installer(64bit)/Installer(64bit)/Express/SingleImage/LogFiles/.gitignore b/odbc/Installer(64bit)/Installer(64bit)/Express/SingleImage/LogFiles/.gitignore
deleted file mode 100644
index 2211df6..0000000
--- a/odbc/Installer(64bit)/Installer(64bit)/Express/SingleImage/LogFiles/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer(64bit)/Installer(64bit)/Express/SingleImage/Reports/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Installer(64bit)/Installer(64bit)/Express/SingleImage/Reports/.gitignore b/odbc/Installer(64bit)/Installer(64bit)/Express/SingleImage/Reports/.gitignore
deleted file mode 100644
index 43d1567..0000000
--- a/odbc/Installer(64bit)/Installer(64bit)/Express/SingleImage/Reports/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.htm
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer/Installer.isl
----------------------------------------------------------------------
diff --git a/odbc/Installer/Installer.isl b/odbc/Installer/Installer.isl
index 8beb61d..1a4c4f9 100644
--- a/odbc/Installer/Installer.isl
+++ b/odbc/Installer/Installer.isl
@@ -1129,6 +1129,7 @@
<col def="I4">ISAttributes</col>
<col def="S255">ISFolderName</col>
<row><td>ALLUSERSPROFILE</td><td>TARGETDIR</td><td>.:ALLUSE~1|All Users</td><td/><td>0</td><td/></row>
+ <row><td>APACHE_KYLIN</td><td>ProgramFilesFolder</td><td>APACHE~1|Apache Kylin</td><td/><td>0</td><td/></row>
<row><td>AdminToolsFolder</td><td>TARGETDIR</td><td>.:Admint~1|AdminTools</td><td/><td>0</td><td/></row>
<row><td>AppDataFolder</td><td>TARGETDIR</td><td>.:APPLIC~1|Application Data</td><td/><td>0</td><td/></row>
<row><td>CommonAppDataFolder</td><td>TARGETDIR</td><td>.:Common~1|CommonAppData</td><td/><td>0</td><td/></row>
@@ -1139,11 +1140,12 @@
<row><td>FavoritesFolder</td><td>TARGETDIR</td><td>.:FAVORI~1|Favorites</td><td/><td>0</td><td/></row>
<row><td>FontsFolder</td><td>TARGETDIR</td><td>.:Fonts</td><td/><td>0</td><td/></row>
<row><td>GlobalAssemblyCache</td><td>TARGETDIR</td><td>.:Global~1|GlobalAssemblyCache</td><td/><td>0</td><td/></row>
- <row><td>INSTALLDIR</td><td>KYLINODBCDRIVER__X86_</td><td>.</td><td/><td>0</td><td/></row>
+ <row><td>INSTALLDIR</td><td>KYLINODBCDRIVER__X86_1</td><td>.</td><td/><td>0</td><td/></row>
<row><td>ISCommonFilesFolder</td><td>CommonFilesFolder</td><td>Instal~1|InstallShield</td><td/><td>0</td><td/></row>
<row><td>ISYourDataBaseDir</td><td>INSTALLDIR</td><td>Database</td><td/><td>0</td><td/></row>
<row><td>KYLINODBCDRIVER</td><td>kylinolap</td><td>KYLINO~1|KylinODBCDriver</td><td/><td>0</td><td/></row>
<row><td>KYLINODBCDRIVER__X86_</td><td>kylinolap</td><td>KYLINO~1|KylinODBCDriver (x86)</td><td/><td>0</td><td/></row>
+ <row><td>KYLINODBCDRIVER__X86_1</td><td>APACHE_KYLIN</td><td>KYLINO~1|KylinODBCDriver (x86)</td><td/><td>0</td><td/></row>
<row><td>LocalAppDataFolder</td><td>TARGETDIR</td><td>.:LocalA~1|LocalAppData</td><td/><td>0</td><td/></row>
<row><td>MY_PRODUCT_NAME</td><td>kylinolap</td><td>MYPROD~1|My Product Name</td><td/><td>0</td><td/></row>
<row><td>MyPicturesFolder</td><td>TARGETDIR</td><td>.:MyPict~1|MyPictures</td><td/><td>0</td><td/></row>
@@ -2641,7 +2643,7 @@
<col def="I2">Encoded</col>
<col def="S0">Comment</col>
<col def="I4">TimeStamp</col>
- <row><td>COMPANY_NAME</td><td>1033</td><td>kylinolap</td><td>0</td><td/><td>1965213424</td></row>
+ <row><td>COMPANY_NAME</td><td>1033</td><td>Apache Kylin</td><td>0</td><td/><td>-182247760</td></row>
<row><td>DN_AlwaysInstall</td><td>1033</td><td>Always Install</td><td>0</td><td/><td>-1977438387</td></row>
<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_COLOR</td><td>1033</td><td>The color settings of your system are not adequate for running [ProductName].</td><td>0</td><td/><td>-1977438387</td></row>
<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_OS</td><td>1033</td><td>The operating system is not adequate for running [ProductName].</td><td>0</td><td/><td>-1977438387</td></row>
@@ -3741,8 +3743,8 @@
<row><td>IDS__TargetReq_DESC_PROCESSOR</td><td>1033</td><td>The processor is not adequate for running [ProductName].</td><td>0</td><td/><td>-1977438387</td></row>
<row><td>IDS__TargetReq_DESC_RAM</td><td>1033</td><td>The amount of RAM is not adequate for running [ProductName].</td><td>0</td><td/><td>-1977438387</td></row>
<row><td>IDS__TargetReq_DESC_RESOLUTION</td><td>1033</td><td>The screen resolution is not adequate for running [ProductName].</td><td>0</td><td/><td>-1977438387</td></row>
- <row><td>ID_STRING1</td><td>1033</td><td>http://kylin.io</td><td>0</td><td/><td>1965188880</td></row>
- <row><td>ID_STRING2</td><td>1033</td><td>kylinolap</td><td>0</td><td/><td>1965213424</td></row>
+ <row><td>ID_STRING1</td><td>1033</td><td>http://kylin.apache.org/</td><td>0</td><td/><td>-182233424</td></row>
+ <row><td>ID_STRING2</td><td>1033</td><td>Apache Kylin</td><td>0</td><td/><td>-182247760</td></row>
<row><td>IIDS_UITEXT_FeatureUninstalled</td><td>1033</td><td>This feature will remain uninstalled.</td><td>0</td><td/><td>-1977438387</td></row>
</table>
@@ -4357,7 +4359,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
<row><td>PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS</td><td>##IDS_PROGMSG_IIS_ROLLBACKWEBSERVICEEXTENSIONS##</td><td/></row>
<row><td>ProductCode</td><td>{A920FB5E-591B-4537-901D-7D0303088884}</td><td/></row>
<row><td>ProductName</td><td>KylinODBCDriver (x86)</td><td/></row>
- <row><td>ProductVersion</td><td>0.7.0000</td><td/></row>
+ <row><td>ProductVersion</td><td>1.1.0000</td><td/></row>
<row><td>ProgressType0</td><td>install</td><td/></row>
<row><td>ProgressType1</td><td>Installing</td><td/></row>
<row><td>ProgressType2</td><td>installed</td><td/></row>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer/Installer.isproj
----------------------------------------------------------------------
diff --git a/odbc/Installer/Installer.isproj b/odbc/Installer/Installer.isproj
index 9e4481b..7c4b2f6 100644
--- a/odbc/Installer/Installer.isproj
+++ b/odbc/Installer/Installer.isproj
@@ -1,4 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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.
+-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<!-- Select a Product Configuration -->
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer/Installer/Express/Interm/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Installer/Installer/Express/Interm/.gitignore b/odbc/Installer/Installer/Express/Interm/.gitignore
deleted file mode 100644
index d6fd0a4..0000000
--- a/odbc/Installer/Installer/Express/Interm/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.Exe
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer/Installer/Express/SingleImage/LogFiles/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Installer/Installer/Express/SingleImage/LogFiles/.gitignore b/odbc/Installer/Installer/Express/SingleImage/LogFiles/.gitignore
deleted file mode 100644
index 2211df6..0000000
--- a/odbc/Installer/Installer/Express/SingleImage/LogFiles/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.txt
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/Installer/Installer/Express/SingleImage/Reports/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Installer/Installer/Express/SingleImage/Reports/.gitignore b/odbc/Installer/Installer/Express/SingleImage/Reports/.gitignore
deleted file mode 100644
index 43d1567..0000000
--- a/odbc/Installer/Installer/Express/SingleImage/Reports/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.htm
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/KylinODBC.sln
----------------------------------------------------------------------
diff --git a/odbc/KylinODBC.sln b/odbc/KylinODBC.sln
index 35091ac..db7f65d 100644
--- a/odbc/KylinODBC.sln
+++ b/odbc/KylinODBC.sln
@@ -1,5 +1,19 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
+# 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.
+#
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{6EE1C577-1826-4EA2-86AC-FE8047D396A9}"
EndProject
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/README.md
----------------------------------------------------------------------
diff --git a/odbc/README.md b/odbc/README.md
index 585b061..ccee034 100644
--- a/odbc/README.md
+++ b/odbc/README.md
@@ -1,4 +1,4 @@
-# Abount KylinODBC
+# About KylinODBC
ODBC Driver to interactive with Kylin REST server
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/ColorPrint.cpp
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/ColorPrint.cpp b/odbc/TestDLL/ColorPrint.cpp
index 17036b2..ceb245b 100644
--- a/odbc/TestDLL/ColorPrint.cpp
+++ b/odbc/TestDLL/ColorPrint.cpp
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <stdio.h>
#include <windows.h>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/ColorPrint.h
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/ColorPrint.h b/odbc/TestDLL/ColorPrint.h
index 472be69..7ad5710 100644
--- a/odbc/TestDLL/ColorPrint.h
+++ b/odbc/TestDLL/ColorPrint.h
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#pragma once
void setPrintColorRED();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/CompareQueryTests.cpp
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/CompareQueryTests.cpp b/odbc/TestDLL/CompareQueryTests.cpp
index dbdab90..c7788a2 100644
--- a/odbc/TestDLL/CompareQueryTests.cpp
+++ b/odbc/TestDLL/CompareQueryTests.cpp
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include "Tests.h"
#include <vector>
@@ -545,4 +545,68 @@ void crossValidate() {
fprintf ( stdout, wstring2string ( *iter ).c_str() );
fprintf ( stdout, "\n\n" );
}
+}
+
+void validateSQLGetTypeInfo () {
+ Sleep ( 1000 );
+ SQLRETURN status;
+ SQLHANDLE hEnv = 0;
+ SQLHANDLE hConn = 0;
+ SQLHANDLE hStmt = 0;
+ wchar_t szConnStrOut[1024];
+ SQLSMALLINT x;
+
+ // BEFORE U CONNECT
+ // allocate ENVIRONMENT
+ status = SQLAllocHandle ( SQL_HANDLE_ENV, SQL_NULL_HANDLE, &hEnv );
+ // 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 );
+ // check for error
+ ODBC_CHK_ERROR ( SQL_HANDLE_ENV, hEnv, status, "" );
+ // allocate CONNECTION
+ status = SQLAllocHandle ( SQL_HANDLE_DBC, hEnv, &hConn );
+ // check for error
+ ODBC_CHK_ERROR ( SQL_HANDLE_ENV, hEnv, status, "" );
+ #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, &x,
+ SQL_DRIVER_COMPLETE );
+ #else
+ status = SQLDriverConnectW ( hConn , GetDesktopWindow(),
+ //L"DSN=testDSN;",
+ L"DRIVER={KylinODBCDriver};PROJECT=default;UID=ADMIN;SERVER=http://localhost;PORT=80;",
+ SQL_NTS, szConnStrOut, 1024, &x,
+ SQL_DRIVER_COMPLETE );
+ #endif
+ // check for error
+ ODBC_CHK_ERROR ( SQL_HANDLE_DBC, hConn, status, "" );
+ // CONGRATUALTIONS ---- u r connected to a DBMS via an ODBC driver
+ // allocate STATEMENT
+ status = SQLAllocHandle ( SQL_HANDLE_STMT, hConn, &hStmt );
+ // check for error
+ ODBC_CHK_ERROR ( SQL_HANDLE_DBC, hConn, status, "" );
+ // execute the statement
+ //status = SQLExecDirect ( hStmt, ( unsigned char* )argv[1], SQL_NTS );
+ status = SQLGetTypeInfoW ( hStmt, SQL_ALL_TYPES);
+ // check for error
+ ODBC_CHK_ERROR ( SQL_HANDLE_STMT, hConn, status, "" );
+ // check for error
+ ODBC_CHK_ERROR ( SQL_HANDLE_STMT, hStmt, status, "" );
+Cleanup:
+
+ if ( hStmt )
+ { SQLFreeHandle ( SQL_HANDLE_STMT, hStmt ); }
+
+ if ( hConn )
+ { SQLFreeHandle ( SQL_HANDLE_DBC, hConn ); }
+
+ if ( hEnv )
+ { SQLFreeHandle ( SQL_HANDLE_ENV, hEnv ); }
+
+ return;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/Report.cpp
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/Report.cpp b/odbc/TestDLL/Report.cpp
index a637653..9df18f2 100644
--- a/odbc/TestDLL/Report.cpp
+++ b/odbc/TestDLL/Report.cpp
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include "Tests.h"
void report ( const char* msg ) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/RestAPITest.cpp
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/RestAPITest.cpp b/odbc/TestDLL/RestAPITest.cpp
index 31a004f..c720acf 100644
--- a/odbc/TestDLL/RestAPITest.cpp
+++ b/odbc/TestDLL/RestAPITest.cpp
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include "Tests.h"
void restAPITest() {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/SimpleQueryTest.cpp
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/SimpleQueryTest.cpp b/odbc/TestDLL/SimpleQueryTest.cpp
index 4ec2b23..3df7950 100644
--- a/odbc/TestDLL/SimpleQueryTest.cpp
+++ b/odbc/TestDLL/SimpleQueryTest.cpp
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include "Tests.h"
void simpleQueryTest() {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/Source.cpp
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/Source.cpp b/odbc/TestDLL/Source.cpp
index 389ebd5..e2ce6c3 100644
--- a/odbc/TestDLL/Source.cpp
+++ b/odbc/TestDLL/Source.cpp
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include "vld.h"
#include "Tests.h"
using namespace std;
@@ -27,5 +27,6 @@ int main() {
//regression test:
//simpleQueryTest();
//queryFlowTest();
- crossValidate();
+ //crossValidate();
+ validateSQLGetTypeInfo();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/TestDLL.vcxproj
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/TestDLL.vcxproj b/odbc/TestDLL/TestDLL.vcxproj
index c1e27c7..659cbc2 100644
--- a/odbc/TestDLL/TestDLL.vcxproj
+++ b/odbc/TestDLL/TestDLL.vcxproj
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -103,6 +122,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>$(SolutionDir)\Common\$(Platform)\$(Configuration)\Common.lib;$(SolutionDir)\Driver\$(Platform)\$(Configuration)\driver.lib;$(CPPREST_HOME)\Binaries\Win32\Release\cpprest110_2_0.lib;winhttp.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib</AdditionalDependencies>
+ <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/TestDLL.vcxproj.filters
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/TestDLL.vcxproj.filters b/odbc/TestDLL/TestDLL.vcxproj.filters
index ee88b0a..d8a7dc6 100644
--- a/odbc/TestDLL/TestDLL.vcxproj.filters
+++ b/odbc/TestDLL/TestDLL.vcxproj.filters
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/TestDLL.vcxproj.user
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/TestDLL.vcxproj.user b/odbc/TestDLL/TestDLL.vcxproj.user
index 1b93756..38833e1 100644
--- a/odbc/TestDLL/TestDLL.vcxproj.user
+++ b/odbc/TestDLL/TestDLL.vcxproj.user
@@ -1,4 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
+<!--
+ 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.
+-->
+
+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LocalDebuggerEnvironment>PATH=$(SolutionDir)\Driver\$(Platform)\$(Configuration)\;%PATH%</LocalDebuggerEnvironment>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/Tests.h
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/Tests.h b/odbc/TestDLL/Tests.h
index 98fecee..5b8bbe4 100644
--- a/odbc/TestDLL/Tests.h
+++ b/odbc/TestDLL/Tests.h
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#pragma once
#define prod_KServerAddr ""
@@ -45,3 +45,4 @@ void simpleQueryTest();
void queryFlowTest();
void restAPITest();
void crossValidate();
+void validateSQLGetTypeInfo();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/TestDLL/testqueries.txt
----------------------------------------------------------------------
diff --git a/odbc/TestDLL/testqueries.txt b/odbc/TestDLL/testqueries.txt
index 4b71e89..ca3ca32 100644
--- a/odbc/TestDLL/testqueries.txt
+++ b/odbc/TestDLL/testqueries.txt
@@ -1,13 +1,25 @@
-
-
-
-
+--
+-- 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.
+--
select lstg_format_name, sum(price) as GMV from test_kylin_fact where lstg_format_name='FP-GTC' group by lstg_format_name order by lstg_format_name
select LSTG_FORMAT_NAME, sum(price)as GMV, count(1) as TRANS_CNT from test_kylin_fact group by LSTG_FORMAT_NAME order by LSTG_FORMAT_NAME
-
select test_kylin_fact.lstg_format_name, sum(price) as GMV, count(*) as TRANS_CNT from test_kylin_fact group by test_kylin_fact.lstg_format_name order by test_kylin_fact.lstg_format_name
select test_kylin_fact.lstg_format_name,sum(test_kylin_fact.price) as GMV , count(*) as TRANS_CNT from test_kylin_fact group by test_kylin_fact.lstg_format_name having sum(price)>5000 order by test_kylin_fact.lstg_format_name
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/doc/reference/ODBC Driver Development.docx
----------------------------------------------------------------------
diff --git a/odbc/doc/reference/ODBC Driver Development.docx b/odbc/doc/reference/ODBC Driver Development.docx
deleted file mode 100644
index a88c953..0000000
Binary files a/odbc/doc/reference/ODBC Driver Development.docx and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4e161aac/odbc/doc/reference/how to customize a odbc driver based on REST service (chinese).docx
----------------------------------------------------------------------
diff --git a/odbc/doc/reference/how to customize a odbc driver based on REST service (chinese).docx b/odbc/doc/reference/how to customize a odbc driver based on REST service (chinese).docx
deleted file mode 100644
index 402313d..0000000
Binary files a/odbc/doc/reference/how to customize a odbc driver based on REST service (chinese).docx and /dev/null differ