From ec5bcda74c7b859cc9461090b3724531d9abc44c Mon Sep 17 00:00:00 2001
From: Bill <sunyinqi0508@gmail.com>
Date: Tue, 20 Sep 2022 22:21:40 +0800
Subject: [PATCH] bug fix

---
 msc-plugin/msc-plugin.vcxproj | 3 +++
 server/aggregations.h         | 3 +--
 server/server.cpp             | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/msc-plugin/msc-plugin.vcxproj b/msc-plugin/msc-plugin.vcxproj
index ac70b3a..c187361 100644
--- a/msc-plugin/msc-plugin.vcxproj
+++ b/msc-plugin/msc-plugin.vcxproj
@@ -230,6 +230,9 @@
   <ItemGroup>
     <ClCompile Include="..\out.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\udf.hpp" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/server/aggregations.h b/server/aggregations.h
index 0e41fc9..ac15d8e 100644
--- a/server/aggregations.h
+++ b/server/aggregations.h
@@ -16,8 +16,7 @@ constexpr static inline size_t count(const T&) { return 1; }
 
 // TODO: Specializations for dt/str/none
 template<class T, template<typename ...> class VT>
-// types::GetLongType<T> 
-LL_Type sum(const VT<T>& v) {
+types::GetLongType<T> sum(const VT<T>& v) {
 	types::GetLongType<T> ret = 0;
 	for (const auto& _v : v)
 		ret += _v;
diff --git a/server/server.cpp b/server/server.cpp
index d128abc..b5b8195 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -333,9 +333,9 @@ int test_main()
     //printf("sibal: %p %p\n", aa, bb);
 
     const char* qs[]= {
-        "CREATE TABLE network(src VARCHAR(3), dst VARCHAR(3), len INT, _time INT);",
-        "COPY OFFSET 2 INTO network FROM  'c:/Users/sunyi/Desktop/AQuery2/data/network.csv'  ON SERVER    USING DELIMITERS  ',';",
-        "SELECT src, dst, len, _time  FROM network ORDER BY src, dst, _time",
+        "CREATE TABLE test1(a INT, b INT, c INT, d INT);",
+        "COPY OFFSET 2 INTO test1 FROM  'w:/gg/AQuery++/data/test.csv'  ON SERVER    USING DELIMITERS  ',';",
+        "SELECT sum(a), b, d, c  FROM test1 GROUP BY c, b, d  ORDER BY b ;",
     };
     n_recv = sizeof(qs)/(sizeof (char*));
 	n_recvd = const_cast<char**>(qs);
@@ -354,7 +354,7 @@ int test_main()
     cxt->log("handle: %p\n", handle);
     if (handle) {
         cxt->log("inner\n");
-        code_snippet c = reinterpret_cast<code_snippet>(dlsym(handle, "dll_54aqwy"));
+        code_snippet c = reinterpret_cast<code_snippet>(dlsym(handle, "dll_C4nJZu"));
         cxt->log("routine: %p\n", c);
         if (c) {
             cxt->log("inner\n");