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 @@ + + + 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 VT> -// types::GetLongType -LL_Type sum(const VT& v) { +types::GetLongType sum(const VT& v) { types::GetLongType 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(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(dlsym(handle, "dll_54aqwy")); + code_snippet c = reinterpret_cast(dlsym(handle, "dll_C4nJZu")); cxt->log("routine: %p\n", c); if (c) { cxt->log("inner\n");