diff --git a/msc-plugin/launcher.vcxproj b/msc-plugin/launcher.vcxproj index d107496..0b0d90b 100644 --- a/msc-plugin/launcher.vcxproj +++ b/msc-plugin/launcher.vcxproj @@ -17,6 +17,14 @@ Release x64 + + RelWDbgInf + Win32 + + + RelWDbgInf + x64 + sharedlib Win32 @@ -52,6 +60,14 @@ Unicode false + + Application + false + v143 + true + Unicode + false + Application false @@ -75,6 +91,14 @@ Unicode false + + Application + false + v143 + true + Unicode + false + Application false @@ -94,6 +118,9 @@ + + + @@ -103,6 +130,9 @@ + + + @@ -117,6 +147,11 @@ .exe $(SolutionDir)..\ + + false + .exe + $(SolutionDir)..\ + false .exe @@ -132,6 +167,11 @@ .exe $(SolutionDir)..\ + + false + .exe + $(SolutionDir)..\ + false .exe @@ -145,7 +185,7 @@ true true true - stdcpp17 + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc @@ -166,7 +206,32 @@ true true true - stdcpp17 + stdcpplatest + stdc17 + $(ProjectDir)\..\monetdb\msvc + None + + + Console + true + true + false + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc None @@ -215,9 +280,10 @@ true true true - stdcpp17 + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc + true Console @@ -225,6 +291,9 @@ ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + true + @@ -236,7 +305,32 @@ true true true - stdcpp17 + stdcpplatest + stdc17 + $(ProjectDir)\..\monetdb\msvc + None + + + Console + true + true + false + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc None diff --git a/msc-plugin/libaquery.vcxproj b/msc-plugin/libaquery.vcxproj index 82162c9..85cb9f2 100644 --- a/msc-plugin/libaquery.vcxproj +++ b/msc-plugin/libaquery.vcxproj @@ -1,4 +1,4 @@ - + @@ -17,6 +17,14 @@ Release x64 + + RelWDbgInf + Win32 + + + RelWDbgInf + x64 + 16.0 @@ -39,6 +47,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + StaticLibrary true @@ -52,6 +67,13 @@ true Unicode + + StaticLibrary + false + v143 + true + Unicode + @@ -63,12 +85,18 @@ + + + + + + true @@ -79,6 +107,11 @@ .lib $(SolutionDir)..\ + + false + .lib + $(SolutionDir)..\ + true $(SolutionDir)..\ @@ -88,13 +121,18 @@ .lib $(SolutionDir)..\ + + false + .lib + $(SolutionDir)..\ + Level3 true _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpplatest stdc17 Create pch_msc.hpp @@ -120,7 +158,7 @@ false _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpplatest stdc17 Create pch_msc.hpp @@ -153,13 +191,54 @@ $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + + Level3 + true + true + false + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpplatest + stdc17 + Create + pch_msc.hpp + ProgramDatabase + Full + AnySuitable + Speed + true + true + AdvancedVectorExtensions2 + true + true + false + false + false + true + false + $(ProjectDir)\..\monetdb\msvc + $(SolutionDir)..\msc-plugin\pch_msc.pch + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + Console + true + true + false + false + + + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + Level3 true _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpplatest stdc17 Create pch_msc.hpp @@ -168,6 +247,7 @@ true true $(IntDir)vc$(PlatformToolsetVersion).pdb + true Console @@ -176,6 +256,9 @@ $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + true + @@ -185,7 +268,7 @@ false _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpplatest stdc17 Create pch_msc.hpp @@ -218,6 +301,47 @@ $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + + Level3 + true + true + false + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpplatest + stdc17 + Create + pch_msc.hpp + ProgramDatabase + Full + AnySuitable + Speed + true + true + AdvancedVectorExtensions2 + true + true + false + false + false + true + false + $(ProjectDir)\..\monetdb\msvc + $(SolutionDir)..\msc-plugin\pch_msc.pch + $(IntDir)vc$(PlatformToolsetVersion).pdb + + + Console + true + true + false + false + + + $(ProjectDir)\..\monetdb\msvc\monetdbe.lib; + + diff --git a/msc-plugin/msc-plugin.vcxproj b/msc-plugin/msc-plugin.vcxproj index cec60b3..d7c27c3 100644 --- a/msc-plugin/msc-plugin.vcxproj +++ b/msc-plugin/msc-plugin.vcxproj @@ -1,4 +1,4 @@ - + @@ -17,6 +17,14 @@ Release x64 + + RelWDbgInf + Win32 + + + RelWDbgInf + x64 + 16.0 @@ -42,6 +50,14 @@ Unicode false + + DynamicLibrary + false + v143 + true + Unicode + false + DynamicLibrary true @@ -58,6 +74,14 @@ Unicode false + + DynamicLibrary + false + v143 + true + Unicode + false + @@ -69,12 +93,18 @@ + + + + + + @@ -84,6 +114,10 @@ dll.so + + + dll.so + dll.so @@ -92,13 +126,17 @@ dll.so + + + dll.so + Level3 true _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpplatest Guard false $(ProjectDir)\..\monetdb\msvc @@ -112,6 +150,7 @@ true $(IntDir)vc$(PlatformToolsetVersion).pdb pch_msc.hpp + MaxSpeed Console @@ -129,7 +168,7 @@ false _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpplatest $(ProjectDir)\..\monetdb\msvc stdc17 Use @@ -164,31 +203,85 @@ false + + + Level3 + true + true + false + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpplatest + $(ProjectDir)\..\monetdb\msvc + stdc17 + Use + pch_msc.hpp + ProgramDatabase + Full + AnySuitable + Speed + true + true + AdvancedVectorExtensions2 + true + true + false + false + false + true + false + + + false + $(IntDir)vc$(PlatformToolsetVersion).pdb + pch_msc.hpp + + + Console + true + true + false + $(ProjectDir)\..\dll.so + $(ProjectDir)\..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + false + + Level3 true - _ALLOW_RTCc_IN_STL;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _ALLOW_RTCc_IN_STL;_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 - Guard + stdcpplatest + false false ProgramDatabase - Disabled - false - true + AnySuitable + true + false false $(ProjectDir)\..\monetdb\msvc /WL %(AdditionalOptions) stdc17 - Use + NotUsing pch_msc.hpp true true $(IntDir)vc$(PlatformToolsetVersion).pdb - pch_msc.hpp + + + true + MaxSpeed + Default + MultiThreadedDLL + AdvancedVectorExtensions2 + true + Speed + true + true + false Console @@ -197,6 +290,9 @@ true $(ProjectDir)\..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + + true + @@ -206,7 +302,7 @@ false _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - stdcpp17 + stdcpplatest $(ProjectDir)\..\monetdb\msvc stdc17 Use @@ -241,6 +337,49 @@ false + + + Level3 + true + true + false + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpplatest + $(ProjectDir)\..\monetdb\msvc + stdc17 + Use + pch_msc.hpp + ProgramDatabase + Full + AnySuitable + Speed + true + true + AdvancedVectorExtensions2 + true + true + false + false + false + true + false + + + false + $(IntDir)vc$(PlatformToolsetVersion).pdb + pch_msc.hpp + + + Console + true + true + false + $(ProjectDir)\..\dll.so + $(ProjectDir)\..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;$(CoreLibraryDependencies);%(AdditionalDependencies) + false + + diff --git a/msc-plugin/sdk_example.vcxproj b/msc-plugin/sdk_example.vcxproj index f55e7a9..8ddc9a5 100644 --- a/msc-plugin/sdk_example.vcxproj +++ b/msc-plugin/sdk_example.vcxproj @@ -17,6 +17,14 @@ Release x64 + + RelWDbgInf + Win32 + + + RelWDbgInf + x64 + 16.0 @@ -39,6 +47,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + DynamicLibrary true @@ -52,6 +67,13 @@ true Unicode + + DynamicLibrary + false + v143 + true + Unicode + @@ -63,12 +85,18 @@ + + + + + + $(SolutionDir)..\ @@ -80,6 +108,11 @@ test .so + + $(SolutionDir)..\ + test + .so + $(SolutionDir)..\ test @@ -90,6 +123,11 @@ test .so + + $(SolutionDir)..\ + test + .so + Level3 @@ -124,6 +162,24 @@ true + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpplatest + stdc17 + + + Console + true + true + true + + Level3 @@ -134,11 +190,15 @@ stdc17 true true + true Console true + + true + @@ -158,6 +218,24 @@ true + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpplatest + stdc17 + + + Console + true + true + true + + diff --git a/msc-plugin/server.sln b/msc-plugin/server.sln index 84fb37c..6e2e70f 100644 --- a/msc-plugin/server.sln +++ b/msc-plugin/server.sln @@ -9,6 +9,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj", EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msc-plugin", "msc-plugin.vcxproj", "{8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}" + ProjectSection(ProjectDependencies) = postProject + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F} = {B52AACF7-16A6-4FCA-90AD-867D367BDA4F} + EndProjectSection EndProject Project("{888888A0-9F3D-457C-B088-3A5042F75D52}") = "msvs-py", "..\msvs-py\msvs-py.pyproj", "{CCC243F5-663E-45B7-A6DE-B2468C58B3A7}" EndProject @@ -30,6 +33,8 @@ Global Debug|x86 = Debug|x86 Release|x64 = Release|x64 Release|x86 = Release|x86 + RelWDbgInf|x64 = RelWDbgInf|x64 + RelWDbgInf|x86 = RelWDbgInf|x86 shared|x64 = shared|x64 shared|x86 = shared|x86 sharedlib|x64 = sharedlib|x64 @@ -44,6 +49,10 @@ Global {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x64.Build.0 = Release|x64 {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x86.ActiveCfg = Release|Win32 {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.Release|x86.Build.0 = Release|Win32 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.RelWDbgInf|x64.ActiveCfg = RelWDbgInf|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.RelWDbgInf|x64.Build.0 = RelWDbgInf|x64 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.RelWDbgInf|x86.ActiveCfg = RelWDbgInf|Win32 + {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.RelWDbgInf|x86.Build.0 = RelWDbgInf|Win32 {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.shared|x64.ActiveCfg = sharedlib|x64 {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.shared|x86.ActiveCfg = sharedlib|Win32 {031352C2-AFBB-45AA-9518-DBC1F9EF2AF3}.sharedlib|x64.ActiveCfg = sharedlib|x64 @@ -58,6 +67,10 @@ Global {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x64.Build.0 = Release|x64 {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x86.ActiveCfg = Release|Win32 {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.Release|x86.Build.0 = Release|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.RelWDbgInf|x64.ActiveCfg = RelWDbgInf|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.RelWDbgInf|x64.Build.0 = RelWDbgInf|x64 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.RelWDbgInf|x86.ActiveCfg = RelWDbgInf|Win32 + {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.RelWDbgInf|x86.Build.0 = RelWDbgInf|Win32 {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x64.ActiveCfg = Release|x64 {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x64.Build.0 = Release|x64 {8081FDAA-4D13-4B7A-ADB2-8224AF7F1C81}.shared|x86.ActiveCfg = Release|Win32 @@ -70,6 +83,8 @@ Global {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Debug|x86.ActiveCfg = Debug|Any CPU {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Release|x64.ActiveCfg = Release|Any CPU {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.Release|x86.ActiveCfg = Release|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.RelWDbgInf|x64.ActiveCfg = RelWDbgInf|Any CPU + {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.RelWDbgInf|x86.ActiveCfg = RelWDbgInf|Any CPU {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.shared|x64.ActiveCfg = Release|Any CPU {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.shared|x86.ActiveCfg = Release|Any CPU {CCC243F5-663E-45B7-A6DE-B2468C58B3A7}.sharedlib|x64.ActiveCfg = Release|Any CPU @@ -82,6 +97,10 @@ Global {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Release|x64.Build.0 = Release|x64 {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Release|x86.ActiveCfg = Release|Win32 {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.Release|x86.Build.0 = Release|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.RelWDbgInf|x64.ActiveCfg = RelWDbgInf|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.RelWDbgInf|x64.Build.0 = RelWDbgInf|x64 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.RelWDbgInf|x86.ActiveCfg = RelWDbgInf|Win32 + {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.RelWDbgInf|x86.Build.0 = RelWDbgInf|Win32 {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.shared|x64.ActiveCfg = Debug|x64 {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.shared|x64.Build.0 = Debug|x64 {B52AACF7-16A6-4FCA-90AD-867D367BDA4F}.shared|x86.ActiveCfg = Debug|Win32 @@ -98,6 +117,10 @@ Global {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Release|x64.Build.0 = Release|x64 {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Release|x86.ActiveCfg = Release|Win32 {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.Release|x86.Build.0 = Release|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.RelWDbgInf|x64.ActiveCfg = RelWDbgInf|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.RelWDbgInf|x64.Build.0 = RelWDbgInf|x64 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.RelWDbgInf|x86.ActiveCfg = RelWDbgInf|Win32 + {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.RelWDbgInf|x86.Build.0 = RelWDbgInf|Win32 {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.shared|x64.ActiveCfg = sharedlib|x64 {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.shared|x64.Build.0 = sharedlib|x64 {C8E25628-0B46-4CBE-90DF-5228F79A5A64}.shared|x86.ActiveCfg = sharedlib|Win32 @@ -114,6 +137,10 @@ Global {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.Release|x64.Build.0 = Release|x64 {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.Release|x86.ActiveCfg = Release|Win32 {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.Release|x86.Build.0 = Release|Win32 + {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.RelWDbgInf|x64.ActiveCfg = RelWDbgInf|x64 + {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.RelWDbgInf|x64.Build.0 = RelWDbgInf|x64 + {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.RelWDbgInf|x86.ActiveCfg = RelWDbgInf|Win32 + {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.RelWDbgInf|x86.Build.0 = RelWDbgInf|Win32 {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.shared|x64.ActiveCfg = Debug|x64 {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.shared|x64.Build.0 = Debug|x64 {F954797B-C148-4CBF-9FB4-A9A450EFEC38}.shared|x86.ActiveCfg = Debug|Win32 @@ -130,6 +157,10 @@ Global {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.Release|x64.Build.0 = Release|x64 {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.Release|x86.ActiveCfg = Release|Win32 {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.Release|x86.Build.0 = Release|Win32 + {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.RelWDbgInf|x64.ActiveCfg = RelWDbgInf|x64 + {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.RelWDbgInf|x64.Build.0 = RelWDbgInf|x64 + {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.RelWDbgInf|x86.ActiveCfg = RelWDbgInf|Win32 + {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.RelWDbgInf|x86.Build.0 = RelWDbgInf|Win32 {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.shared|x64.ActiveCfg = sharedlib|x64 {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.shared|x64.Build.0 = sharedlib|x64 {73BD0DDA-7E66-4318-B46B-B8207AFA6355}.shared|x86.ActiveCfg = sharedlib|Win32 diff --git a/msc-plugin/server.vcxproj b/msc-plugin/server.vcxproj index cf517b3..ac53f6f 100644 --- a/msc-plugin/server.vcxproj +++ b/msc-plugin/server.vcxproj @@ -17,6 +17,14 @@ Release x64 + + RelWDbgInf + Win32 + + + RelWDbgInf + x64 + sharedlib Win32 @@ -52,6 +60,14 @@ Unicode false + + DynamicLibrary + false + v143 + true + Unicode + false + DynamicLibrary false @@ -75,6 +91,14 @@ Unicode false + + DynamicLibrary + false + v143 + true + Unicode + false + DynamicLibrary false @@ -94,6 +118,9 @@ + + + @@ -103,6 +130,9 @@ + + + @@ -117,6 +147,11 @@ .so $(SolutionDir)..\ + + false + .so + $(SolutionDir)..\ + false .so @@ -132,6 +167,11 @@ .so $(SolutionDir)..\ + + false + .so + $(SolutionDir)..\ + false .so @@ -145,7 +185,7 @@ true true true - stdcpp17 + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc @@ -166,7 +206,32 @@ true true true - stdcpp17 + stdcpplatest + stdc17 + $(ProjectDir)\..\monetdb\msvc + None + + + Console + true + true + false + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc None @@ -215,9 +280,10 @@ true true true - stdcpp17 + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc + true Console @@ -225,6 +291,9 @@ ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + true + @@ -236,7 +305,32 @@ true true true - stdcpp17 + stdcpplatest + stdc17 + $(ProjectDir)\..\monetdb\msvc + None + + + Console + true + true + false + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc None diff --git a/msc-plugin/testmain.vcxproj b/msc-plugin/testmain.vcxproj index 353cb78..b89ef43 100644 --- a/msc-plugin/testmain.vcxproj +++ b/msc-plugin/testmain.vcxproj @@ -17,6 +17,14 @@ Release x64 + + RelWDbgInf + Win32 + + + RelWDbgInf + x64 + sharedlib Win32 @@ -52,6 +60,14 @@ Unicode false + + Application + false + v143 + true + Unicode + false + Application false @@ -75,6 +91,14 @@ Unicode false + + Application + false + v143 + true + Unicode + false + Application false @@ -94,6 +118,9 @@ + + + @@ -103,6 +130,9 @@ + + + @@ -117,6 +147,11 @@ .exe $(SolutionDir)..\ + + false + .exe + $(SolutionDir)..\ + false .exe @@ -132,6 +167,11 @@ .exe $(SolutionDir)..\ + + false + .exe + $(SolutionDir)..\ + false .exe @@ -145,7 +185,7 @@ true true true - stdcpp17 + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc @@ -166,7 +206,7 @@ true true true - stdcpp17 + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc None @@ -181,6 +221,32 @@ /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpplatest + stdc17 + $(ProjectDir)\..\monetdb\msvc + ProgramDatabase + + + Console + true + true + DebugFull + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + true + + Level3 @@ -215,9 +281,10 @@ true true true - stdcpp17 + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc + true Console @@ -225,6 +292,9 @@ ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + true + @@ -236,7 +306,7 @@ true true true - stdcpp17 + stdcpplatest stdc17 $(ProjectDir)\..\monetdb\msvc None @@ -251,6 +321,32 @@ /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + + + Level3 + true + true + true + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + true + true + stdcpplatest + stdc17 + $(ProjectDir)\..\monetdb\msvc + ProgramDatabase + + + Console + true + true + DebugFull + ..\libaquery.lib;$(ProjectDir)\..\monetdb\msvc\monetdbe.lib;%(AdditionalDependencies) + false + /WHOLEARCHIVE:libaquery.lib %(AdditionalOptions) + true + + Level3 diff --git a/msvs-py/msvs-py.pyproj b/msvs-py/msvs-py.pyproj index c17a7f4..be50d88 100644 --- a/msvs-py/msvs-py.pyproj +++ b/msvs-py/msvs-py.pyproj @@ -23,6 +23,11 @@ true false + + true + false + bin\RelWDbgInf\ + diff --git a/server/aggregations.h b/server/aggregations.h index 0f1d8f8..ccd5c25 100644 --- a/server/aggregations.h +++ b/server/aggregations.h @@ -186,6 +186,20 @@ decayed_t> sumw(uint32_t w, const VT& arr) { return ret; } +template class VT> +void avgw(uint32_t w, const VT& arr, decayed_t>>& ret) { + typedef types::GetFPType> FPType; + const uint32_t& len = arr.size; + uint32_t i = 0; + types::GetLongType s{}; + w = w > len ? len : w; + if (len) s = ret[i++] = arr[0]; + for (; i < w; ++i) + ret[i] = (s += arr[i]) / (FPType)(i + 1); + for (; i < len; ++i) + ret[i] = ret[i - 1] + (arr[i] - arr[i - w]) / (FPType)w; +} + template class VT> decayed_t>> avgw(uint32_t w, const VT& arr) { typedef types::GetFPType> FPType; diff --git a/server/hasher.h b/server/hasher.h index 22a98e2..b632319 100644 --- a/server/hasher.h +++ b/server/hasher.h @@ -132,3 +132,7 @@ namespace ankerl::unordered_dense{ struct hash> : public hasher{ }; } +struct aq_hashtable_value_t { + uint32_t id; + uint32_t cnt; +}; \ No newline at end of file diff --git a/server/server.cpp b/server/server.cpp index 64f6544..3a6452e 100644 --- a/server/server.cpp +++ b/server/server.cpp @@ -1,5 +1,5 @@ #include "pch_msc.hpp" - +//#define TESTMAIN #include #include #include @@ -645,7 +645,7 @@ int launcher(int argc, char** argv){ str = std::string("cd ") + pwd + std::string("&& python3 ./prompt.py ") + str; return system(str.c_str()); } -#if true || !( defined(_MSC_VER) && defined(_DEBUG) ) +#if !defined(TESTMAIN) && !( defined(_MSC_VER) && defined(_DEBUG) ) extern "C" int __DLLEXPORT__ main(int argc, char** argv) { #ifdef __AQ_BUILD_LAUNCHER__ return launcher(argc, argv); diff --git a/server/table.h b/server/table.h index 3a33136..370a09c 100644 --- a/server/table.h +++ b/server/table.h @@ -147,18 +147,18 @@ public: return *this; } - // ColView<_Ty> operator [](vector_type& idxs) const { - // return ColView<_Ty>(*this, std::move(idxs)); - // } - // ColView<_Ty> operator [](const vector_type& idxs) const { - // return ColView<_Ty>(*this, idxs); - // } - vector_type<_Ty> operator[](vector_type& idxs) const { - vector_type<_Ty> ret(idxs.size); - for (uint32_t i = 0; i < idxs.size; ++i) - ret.container[i] = this->container[idxs[i]]; - return ret; - } + ColView<_Ty> operator [](vector_type& idxs) const { + return ColView<_Ty>(*this, std::move(idxs)); + } + ColView<_Ty> operator [](const vector_type& idxs) const { + return ColView<_Ty>(*this, idxs); + } + //vector_type<_Ty> operator[](vector_type& idxs) const { + // vector_type<_Ty> ret(idxs.size); + // for (uint32_t i = 0; i < idxs.size; ++i) + // ret.container[i] = this->container[idxs[i]]; + // return ret; + //} vector_type<_Ty> operator [](const std::vector& idxs) const { vector_type<_Ty> ret (this->size); uint32_t i = 0; diff --git a/server/unordered_dense.h b/server/unordered_dense.h index 737d12b..3cfe5c6 100644 --- a/server/unordered_dense.h +++ b/server/unordered_dense.h @@ -1059,6 +1059,16 @@ public: return do_insert_or_assign(std::move(key), std::forward(mapped)).first; } + template + unsigned hashtable_push(K&& key) { + auto it_isinserted = try_emplace(std::forward(key), 1); + if (!it_isinserted.second) { + ++ it_isinserted.first->second; + return static_cast(it_isinserted.first - begin()); + } + return static_cast(end() - begin() - 1); + } + template value_container_type const& { + [[nodiscard]] auto values() noexcept -> value_container_type & { return m_values; } diff --git a/server/vector_type.hpp b/server/vector_type.hpp index d69c56c..29d914a 100644 --- a/server/vector_type.hpp +++ b/server/vector_type.hpp @@ -88,6 +88,12 @@ public: constexpr vector_type(const uint32_t size, void* data) : size(size), capacity(0), container(static_cast<_Ty*>(data)) {} + void init_from(const uint32_t size, void* data) { + this->container = static_cast<_Ty*>(data); + this->size = size; + this->capacity = 0; + } + vector_type<_Ty>& operator =(const _Ty& vt) { if (!container) { container = (_Ty*)malloc(sizeof(_Ty)); @@ -134,7 +140,7 @@ public: container[i++] = v; } return *this; - } + } vector_type<_Ty> distinct_copy(){ auto d_vals = distinct_common(); vector_type<_Ty> ret(d_vals.size()); @@ -325,7 +331,7 @@ public: inline vector_type<_Ty> subvec_deep(uint32_t start = 0) const { return subvec_deep(start, size); } vector_type<_Ty> getRef() { return vector_type<_Ty>(container, size); } ~vector_type() { - if (capacity > 0) GC::gc_handle->reg(container, sizeof(_Ty) * capacity);//free(container); + if (capacity > 0);// GC::gc_handle->reg(container, sizeof(_Ty) * capacity);//free(container); container = 0; size = capacity = 0; } #define Compare(_op) \