diff --git a/CMakeLists.txt b/CMakeLists.txt index 251ad2ded6..bbd2f153d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,6 +82,8 @@ endif() if (PSP_CPP_BUILD AND NOT PSP_CPP_BUILD_STRICT) message(WARNING "${Cyan}Building C++ without strict warnings${ColorReset}") +else() + message(WARNING "${Cyan}Building C++ with strict warnings${ColorReset}") endif() string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER ) diff --git a/scripts/build_cpp.js b/scripts/build_cpp.js index 5ecccefaa6..6e680c9f87 100644 --- a/scripts/build_cpp.js +++ b/scripts/build_cpp.js @@ -24,6 +24,8 @@ function docker(image = "emsdk") { return cmd; } +let flags = " -DPSP_WASM_BUILD=0 -DPSP_CPP_BUILD=1 -DPSP_CPP_BUILD_TESTS=1 -DPSP_CPP_BUILD_STRICT=1"; + try { execute("mkdir -p cppbuild"); @@ -35,10 +37,10 @@ try { cmd = "cd cppbuild && "; } - cmd += " cmake ../ -DPSP_WASM_BUILD=0 -DPSP_CPP_BUILD=1 -DPSP_CPP_BUILD_TESTS=1"; + cmd += ` cmake ../ ${flags}`; if (process.env.PSP_DEBUG) { - cmd += `-DCMAKE_BUILD_TYPE=debug`; + cmd += ` -DCMAKE_BUILD_TYPE=debug`; } if (process.env.PSP_DOCKER) { @@ -49,6 +51,6 @@ try { execute("cd cppbuild && make -j${PSP_CPU_COUNT-8}"); } } catch (e) { - console.log(e); + console.log(e.message); process.exit(1); } diff --git a/scripts/build_python.js b/scripts/build_python.js index 01621113d5..5e0ce375b6 100644 --- a/scripts/build_python.js +++ b/scripts/build_python.js @@ -29,6 +29,6 @@ try { execute(cmd); } } catch (e) { - console.log(e); + console.log(e.message); process.exit(1); } diff --git a/scripts/test.js b/scripts/test.js index f44997a837..e21e49d674 100644 --- a/scripts/test.js +++ b/scripts/test.js @@ -108,6 +108,6 @@ try { } } } catch (e) { - console.log(e); + console.log(e.message); process.exit(1); } diff --git a/scripts/test_cpp.js b/scripts/test_cpp.js index fdd5c65283..b1291dfd4c 100644 --- a/scripts/test_cpp.js +++ b/scripts/test_cpp.js @@ -22,13 +22,12 @@ function docker(image = "emsdk") { } try { - execute("mkdir -p cppbuild"); if (process.env.PSP_DOCKER) { execute(docker("cpp") + " ./test/psp_test"); } else { execute("./cppbuild/test/psp_test"); } } catch (e) { - console.log(e); + console.log(e.message); process.exit(1); } diff --git a/scripts/test_python.js b/scripts/test_python.js index 17546ac6d7..dfae9c1f62 100644 --- a/scripts/test_python.js +++ b/scripts/test_python.js @@ -21,14 +21,13 @@ function docker(image = "emsdk") { return cmd; } - // Copy .so in place to perspective package try { let cmd1 = "cp `find build -name 'libbinding.so'` python/perspective/table/"; let cmd2 = "cp `find build -name 'libpsp.so'` python/perspective/table/"; if (process.env.PSP_DOCKER) { - execute(docker("python") + " bash -c \"" + cmd1 + "\""); - execute(docker("python") + " bash -c \"" + cmd2 + "\""); + execute(docker("python") + ' bash -c "' + cmd1 + '"'); + execute(docker("python") + ' bash -c "' + cmd2 + '"'); } else { execute(cmd1); execute(cmd2); @@ -40,11 +39,11 @@ try { try { let cmd = "cd python && python3 -m nose2 -v perspective --with-coverage --coverage=perspective"; if (process.env.PSP_DOCKER) { - execute(docker("python") + " bash -c \"" + cmd + "\""); + execute(docker("python") + ' bash -c "' + cmd + '"'); } else { execute(cmd); } } catch (e) { - console.log(e); + console.log(e.message); process.exit(1); } diff --git a/src/cpp/aggspec.cpp b/src/cpp/aggspec.cpp index 5079936f6f..52616b6707 100644 --- a/src/cpp/aggspec.cpp +++ b/src/cpp/aggspec.cpp @@ -21,11 +21,9 @@ t_col_name_type::t_col_name_type(const std::string& name, t_dtype type) : m_name(name) , m_type(type) {} -t_aggspec::t_aggspec() - : m_kernel(0) {} +t_aggspec::t_aggspec(){} -t_aggspec::t_aggspec(const t_aggspec_recipe& v) - : m_kernel(0) { +t_aggspec::t_aggspec(const t_aggspec_recipe& v) { m_name = v.m_name; m_disp_name = v.m_name; m_agg = v.m_agg; @@ -51,28 +49,24 @@ t_aggspec::t_aggspec( : m_name(name) , m_disp_name(name) , m_agg(agg) - , m_dependencies(dependencies) - , m_kernel(0) {} + , m_dependencies(dependencies) {} t_aggspec::t_aggspec(const std::string& aggname, t_aggtype agg, const std::string& dep) : m_name(aggname) , m_disp_name(aggname) , m_agg(agg) - , m_dependencies(std::vector{t_dep(dep, DEPTYPE_COLUMN)}) - , m_kernel(0) {} + , m_dependencies(std::vector{t_dep(dep, DEPTYPE_COLUMN)}) {} t_aggspec::t_aggspec(t_aggtype agg, const std::string& dep) : m_agg(agg) - , m_dependencies(std::vector{t_dep(dep, DEPTYPE_COLUMN)}) - , m_kernel(0) {} + , m_dependencies(std::vector{t_dep(dep, DEPTYPE_COLUMN)}) {} t_aggspec::t_aggspec(const std::string& name, const std::string& disp_name, t_aggtype agg, const std::vector& dependencies) : m_name(name) , m_disp_name(disp_name) , m_agg(agg) - , m_dependencies(dependencies) - , m_kernel(0) {} + , m_dependencies(dependencies) {} t_aggspec::t_aggspec(const std::string& name, const std::string& disp_name, t_aggtype agg, const std::vector& dependencies, t_sorttype sort_type) @@ -80,8 +74,7 @@ t_aggspec::t_aggspec(const std::string& name, const std::string& disp_name, t_ag , m_disp_name(disp_name) , m_agg(agg) , m_dependencies(dependencies) - , m_sort_type(sort_type) - , m_kernel(0) {} + , m_sort_type(sort_type) {} t_aggspec::t_aggspec(const std::string& aggname, const std::string& disp_aggname, t_aggtype agg, t_uindex agg_one_idx, t_uindex agg_two_idx, double agg_one_weight, double agg_two_weight) @@ -91,10 +84,7 @@ t_aggspec::t_aggspec(const std::string& aggname, const std::string& disp_aggname , m_agg_one_idx(agg_one_idx) , m_agg_two_idx(agg_two_idx) , m_agg_one_weight(agg_one_weight) - , m_agg_two_weight(agg_two_weight) - , m_kernel(0) - -{} + , m_agg_two_weight(agg_two_weight) {} t_aggspec::~t_aggspec() {} diff --git a/src/cpp/compat_impl_osx.cpp b/src/cpp/compat_impl_osx.cpp index 8fd2cc5e4b..2291e861ff 100644 --- a/src/cpp/compat_impl_osx.cpp +++ b/src/cpp/compat_impl_osx.cpp @@ -33,28 +33,28 @@ t_uindex file_size(t_handle h) { struct stat st; t_index rcode = fstat(h, &st); - PSP_VERBOSE_ASSERT(rcode == 0, "Error in stat"); + PSP_VERBOSE_ASSERT(rcode, == 0, "Error in stat"); return st.st_size; } void close_file(t_handle h) { t_index rcode = close(h); - PSP_VERBOSE_ASSERT(rcode == 0, "Error closing file."); + PSP_VERBOSE_ASSERT(rcode, == 0, "Error closing file."); } void flush_mapping(void* base, t_uindex len) { t_index rcode = msync(base, len, MS_SYNC); - PSP_VERBOSE_ASSERT(rcode != -1, "Error in msync"); + PSP_VERBOSE_ASSERT(rcode, != -1, "Error in msync"); } t_rfmapping::~t_rfmapping() { t_index rcode = munmap(m_base, m_size); - PSP_VERBOSE_ASSERT(rcode == 0, "munmap failed."); + PSP_VERBOSE_ASSERT(rcode, == 0, "munmap failed."); rcode = close(m_fd); - PSP_VERBOSE_ASSERT(rcode == 0, "Error closing file."); + PSP_VERBOSE_ASSERT(rcode, == 0, "Error closing file."); } static void @@ -69,12 +69,12 @@ map_file_internal_(const std::string& fname, t_fflag fflag, t_fflag fmode, size = file_size(fh.value()); } else { t_index rcode = ftruncate(fh.value(), size); - PSP_VERBOSE_ASSERT(rcode >= 0, "ftruncate failed."); + PSP_VERBOSE_ASSERT(rcode, >= 0, "ftruncate failed."); } void* ptr = mmap(0, size, mprot, mflag, fh.value(), 0); - PSP_VERBOSE_ASSERT(ptr != MAP_FAILED, "error in mmap"); + PSP_VERBOSE_ASSERT(ptr, != MAP_FAILED, "error in mmap"); t_handle fd = fh.value(); fh.release(); @@ -102,7 +102,7 @@ std::int64_t psp_curtime() { struct timespec t; std::int32_t rcode = clock_gettime(CLOCK_MONOTONIC, &t); - PSP_VERBOSE_ASSERT(rcode == 0, "Failure in clock_gettime"); + PSP_VERBOSE_ASSERT(rcode, == 0, "Failure in clock_gettime"); std::int64_t ns = t.tv_nsec + t.tv_sec * 1000000000; return ns; } @@ -143,7 +143,6 @@ psp_curmem() { void set_thread_name(std::thread& thr, const std::string& name) { #ifdef PSP_PARALLEL_FOR - auto handle = thr.native_handle(); pthread_setname_np(name.c_str()); #endif } diff --git a/src/cpp/context_grouped_pkey.cpp b/src/cpp/context_grouped_pkey.cpp index 33bafd1d42..6ac9381813 100644 --- a/src/cpp/context_grouped_pkey.cpp +++ b/src/cpp/context_grouped_pkey.cpp @@ -26,8 +26,8 @@ namespace perspective { t_ctx_grouped_pkey::t_ctx_grouped_pkey() - : m_depth_set(false) - , m_depth(0) {} + : m_depth(0), + m_depth_set(false) {} t_ctx_grouped_pkey::~t_ctx_grouped_pkey() {} @@ -636,7 +636,7 @@ t_ctx_grouped_pkey::rebuild() { #ifdef PSP_PARALLEL_FOR PSP_PFOR(0, int(naggs), 1, - [&aggtable, &aggindices, &aggspecs, &tbl, naggs, this](int aggnum) + [&aggtable, &aggindices, &aggspecs, &tbl](int aggnum) #else for (t_uindex aggnum = 0; aggnum < naggs; ++aggnum) #endif diff --git a/src/cpp/context_one.cpp b/src/cpp/context_one.cpp index 894ea6f843..fa882bb46e 100644 --- a/src/cpp/context_one.cpp +++ b/src/cpp/context_one.cpp @@ -23,8 +23,8 @@ namespace perspective { t_ctx1::t_ctx1(const t_schema& schema, const t_config& pivot_config) : t_ctxbase(schema, pivot_config) - , m_depth_set(false) - , m_depth(0) {} + , m_depth(0) + , m_depth_set(false) {} t_ctx1::~t_ctx1() {} diff --git a/src/cpp/context_two.cpp b/src/cpp/context_two.cpp index 9d4aec5139..47a0753b71 100644 --- a/src/cpp/context_two.cpp +++ b/src/cpp/context_two.cpp @@ -17,18 +17,19 @@ #include namespace perspective { + t_ctx2::t_ctx2() - : m_row_depth_set(false) - , m_column_depth_set(false) - , m_row_depth(0) - , m_column_depth(0) {} + : m_row_depth(0) + , m_row_depth_set(false) + , m_column_depth(0) + , m_column_depth_set(false) {} t_ctx2::t_ctx2(const t_schema& schema, const t_config& pivot_config) : t_ctxbase(schema, pivot_config) - , m_row_depth_set(false) - , m_column_depth_set(false) , m_row_depth(0) - , m_column_depth(0) {} + , m_row_depth_set(false) + , m_column_depth(0) + , m_column_depth_set(false) {} t_ctx2::~t_ctx2() {} diff --git a/src/cpp/gnode.cpp b/src/cpp/gnode.cpp index b163c04916..bc4f90bdc2 100644 --- a/src/cpp/gnode.cpp +++ b/src/cpp/gnode.cpp @@ -362,7 +362,7 @@ t_gnode::_process() { auto key_col = tbl->add_column("psp_pkey", DTYPE_INT64, true); std::int64_t start = get_table()->size(); - for (auto ridx = 0; ridx < tbl->size(); ++ridx) { + for (t_uindex ridx = 0; ridx < tbl->size(); ++ridx) { key_col->set_nth(ridx, start + ridx); } } @@ -947,7 +947,7 @@ t_gnode::notify_contexts(const t_table& flattened) { } else { #ifdef PSP_PARALLEL_FOR PSP_PFOR(0, int(num_ctx), 1, - [this, ¬ify_context_helper](int ctxidx) + [¬ify_context_helper](int ctxidx) #else for (t_index ctxidx = 0; ctxidx < num_ctx; ++ctxidx) #endif diff --git a/src/cpp/gnode_state.cpp b/src/cpp/gnode_state.cpp index 4b3648323d..20910e5151 100644 --- a/src/cpp/gnode_state.cpp +++ b/src/cpp/gnode_state.cpp @@ -209,9 +209,8 @@ t_gstate::update_history(const t_table* tbl) { } #ifdef PSP_PARALLEL_FOR - const t_mapping* m = &m_mapping; PSP_PFOR(0, int(ncols), 1, - [m, tbl, pkey_col, op_col, &col_translation, &fcolumns, &scolumns, &stableidx_vec]( + [tbl, op_col, &col_translation, &fcolumns, &scolumns, &stableidx_vec]( int colidx) #else for (t_uindex colidx = 0; colidx < ncols; ++colidx) diff --git a/src/cpp/port.cpp b/src/cpp/port.cpp index 44dc5c8c74..a8765cb4c5 100644 --- a/src/cpp/port.cpp +++ b/src/cpp/port.cpp @@ -13,8 +13,7 @@ namespace perspective { t_port::t_port(t_port_mode mode, const t_schema& schema) - : m_mode(mode) - , m_schema(schema) + : m_schema(schema) , m_init(false) , m_table(nullptr) , m_prevsize(0) { diff --git a/src/cpp/raii_impl_osx.cpp b/src/cpp/raii_impl_osx.cpp index 71d2937dec..c679c9f78a 100644 --- a/src/cpp/raii_impl_osx.cpp +++ b/src/cpp/raii_impl_osx.cpp @@ -18,7 +18,7 @@ namespace perspective { t_file_handle::~t_file_handle() { if (valid()) { t_index rcode = close(m_value); - PSP_VERBOSE_ASSERT(rcode == 0, "Error closing file."); + PSP_VERBOSE_ASSERT(rcode, == 0, "Error closing file."); } } @@ -35,7 +35,7 @@ t_file_handle::release() { t_mmap_handle::~t_mmap_handle() { if (valid()) { t_index rcode = munmap(m_value, m_len); - PSP_VERBOSE_ASSERT(rcode == 0, "munmap failed."); + PSP_VERBOSE_ASSERT(rcode, == 0, "munmap failed."); } } diff --git a/src/cpp/schema_column.cpp b/src/cpp/schema_column.cpp index d50fd55d0e..7c0014c3e3 100644 --- a/src/cpp/schema_column.cpp +++ b/src/cpp/schema_column.cpp @@ -16,6 +16,5 @@ t_schema_column::t_schema_column(const std::string& tblname, const std::string& const std::string& altname, t_dtype dtype) : m_tblname(tblname) , m_name(name) - , m_altname(altname) - , m_dtype(dtype) {} + , m_altname(altname) {} } // namespace perspective diff --git a/src/cpp/sparse_tree.cpp b/src/cpp/sparse_tree.cpp index 588c3832d0..f4553a253f 100644 --- a/src/cpp/sparse_tree.cpp +++ b/src/cpp/sparse_tree.cpp @@ -78,7 +78,6 @@ t_stree::t_stree(const std::vector& pivots, const std::vectorm_idx; node.set_nstrands(nstrands); - - bool replaced = m_nodes->get().replace(iter, node); - PSP_VERBOSE_ASSERT(replaced, "Failed to replace"); + PSP_VERBOSE_ASSERT(m_nodes->get().replace(iter, node), , "Failed to replace"); // middle argument ignored } populate_pkey_idx(ctx, dtree, dptidx, sptidx, ndepth, new_idx_pkey); @@ -1221,7 +1218,7 @@ t_stree::update_agg_table(t_uindex nidx, t_agg_update_info& info, t_uindex src_r new_value.set( gstate.reduce&)>>(pkeys, spec.get_dependencies()[0].name(), - [this](std::vector& values) { + [](std::vector& values) { std::unordered_set vset; for (const auto& v : values) { vset.insert(v); diff --git a/src/cpp/storage.cpp b/src/cpp/storage.cpp index 60850c18e8..917cfdd246 100644 --- a/src/cpp/storage.cpp +++ b/src/cpp/storage.cpp @@ -368,7 +368,7 @@ t_lstore::reserve_impl(t_uindex capacity, bool allow_shrink) { void* aligned_base = nullptr; int result = posix_memalign(&aligned_base, std::max(sizeof(void*), size_t(m_alignment)), size_t(capacity)); - PSP_VERBOSE_ASSERT(result == 0, "posix_memalign failed"); + PSP_VERBOSE_ASSERT(result, == 0, "posix_memalign failed"); memcpy(aligned_base, base, ocapacity); free(base); diff --git a/src/cpp/storage_impl_osx.cpp b/src/cpp/storage_impl_osx.cpp index f41d9ef773..945bd15872 100644 --- a/src/cpp/storage_impl_osx.cpp +++ b/src/cpp/storage_impl_osx.cpp @@ -77,21 +77,21 @@ t_lstore::create_file() { t_index rcode = ftruncate(fd, truncate_bytes); - PSP_VERBOSE_ASSERT(rcode >= 0, "Ftruncate failed"); + PSP_VERBOSE_ASSERT(rcode, >= 0, "Ftruncate failed"); return fd; } void* t_lstore::create_mapping() { void* rval = mmap(0, capacity(), m_mprot, m_mflags, m_fd, 0); - PSP_VERBOSE_ASSERT(rval != MAP_FAILED, "mmap failed"); + PSP_VERBOSE_ASSERT(rval, != MAP_FAILED, "mmap failed"); return rval; } void t_lstore::resize_mapping(t_uindex cap_new) { t_index rcode = ftruncate(m_fd, cap_new); - PSP_VERBOSE_ASSERT(rcode == 0, "ftruncate failed"); + PSP_VERBOSE_ASSERT(rcode, == 0, "ftruncate failed"); if (munmap(m_base, capacity()) == -1) { throw; @@ -110,7 +110,7 @@ t_lstore::resize_mapping(t_uindex cap_new) { void t_lstore::destroy_mapping() { t_index rc = munmap(m_base, capacity()); - PSP_VERBOSE_ASSERT(!rc, "Failed to destroy mapping"); + PSP_VERBOSE_ASSERT(rc, == 0, "Failed to destroy mapping"); } void diff --git a/src/cpp/table.cpp b/src/cpp/table.cpp index c9cf89f716..baa878e9d3 100644 --- a/src/cpp/table.cpp +++ b/src/cpp/table.cpp @@ -664,10 +664,8 @@ t_table::verify() const { c->verify(); } - auto sz = size(); - for (auto& c : m_columns) { - PSP_VERBOSE_ASSERT(sz == c->size(), "Ragged table encountered"); + PSP_VERBOSE_ASSERT(c ,|| (size() == c->size()), "Ragged table encountered"); } } diff --git a/src/cpp/vocab.cpp b/src/cpp/vocab.cpp index 7389734607..0e0699d806 100644 --- a/src/cpp/vocab.cpp +++ b/src/cpp/vocab.cpp @@ -135,8 +135,8 @@ t_vocab::verify() const { #ifndef PSP_ENABLE_WASM auto zero = rlookup.find(t_uindex(0)); - PSP_VERBOSE_ASSERT(zero != rlookup.end(), "0 Not found"); - PSP_VERBOSE_ASSERT(std::string(zero->second) == "", "0 mapped to unknown"); + PSP_VERBOSE_ASSERT(zero, != rlookup.end(), "0 Not found"); + PSP_VERBOSE_ASSERT(std::string(zero->second), == "", "0 mapped to unknown"); #endif std::unordered_set seen; diff --git a/src/include/perspective/aggspec.h b/src/include/perspective/aggspec.h index b1f9e62fc8..9ef2905240 100644 --- a/src/include/perspective/aggspec.h +++ b/src/include/perspective/aggspec.h @@ -106,7 +106,7 @@ class PERSPECTIVE_EXPORT t_aggspec { double m_agg_one_weight; double m_agg_two_weight; t_invmode m_invmode; - t_uindex m_kernel; + // t_uindex m_kernel; }; PERSPECTIVE_EXPORT t_dtype get_simple_accumulator_type(t_dtype coltype); diff --git a/src/include/perspective/base.h b/src/include/perspective/base.h index e78ed34100..e384c8b23e 100644 --- a/src/include/perspective/base.h +++ b/src/include/perspective/base.h @@ -64,8 +64,10 @@ void psp_abort(); //#define PSP_TRACE_SENTINEL() t_trace _psp_trace_sentinel; #define PSP_TRACE_SENTINEL() +#define GET_PSP_VERBOSE_ASSERT(_1,_2,_3,NAME,...) NAME + #ifdef PSP_DEBUG -#define PSP_VERBOSE_ASSERT(COND, MSG) \ +#define PSP_VERBOSE_ASSERT1(COND, MSG) \ { \ if (!(COND)) { \ std::stringstream ss; \ @@ -76,6 +78,17 @@ void psp_abort(); } \ } +#define PSP_VERBOSE_ASSERT2(COND, EXPR, MSG) \ + { \ + if (!(COND EXPR)) { \ + std::stringstream ss; \ + ss << __FILE__ << ":" << __LINE__ << ": " << MSG << " : " \ + << perspective::get_error_str(); \ + perror(ss.str().c_str()); \ + PSP_ABORT(); \ + } \ + } + #define PSP_COMPLAIN_AND_ABORT(X) \ { \ std::stringstream ss; \ @@ -107,7 +120,8 @@ std::is_pod::value && std::is_standard_layout::value , \ #define LOG_INIT(X) #endif #else -#define PSP_VERBOSE_ASSERT(COND, MSG) +#define PSP_VERBOSE_ASSERT1(COND, MSG) { if(!(COND)) psp_abort(); } +#define PSP_VERBOSE_ASSERT2(EXPR, COND, MSG) { if (!(EXPR COND)) psp_abort(); } #define PSP_COMPLAIN_AND_ABORT(X) psp_abort(); #define PSP_ASSERT_SIMPLE_TYPE(X) #define LOG_CONSTRUCTOR(X) @@ -115,6 +129,8 @@ std::is_pod::value && std::is_standard_layout::value , \ #define LOG_INIT(X) #endif +#define PSP_VERBOSE_ASSERT(...) GET_PSP_VERBOSE_ASSERT(__VA_ARGS__, PSP_VERBOSE_ASSERT2, PSP_VERBOSE_ASSERT1)(__VA_ARGS__) + // Currently only supporting single ports enum t_gnode_processing_mode { NODE_PROCESSING_SIMPLE_DATAFLOW, NODE_PROCESSING_KERNEL }; diff --git a/src/include/perspective/config.h b/src/include/perspective/config.h index c20126dfa7..8eaf31f241 100644 --- a/src/include/perspective/config.h +++ b/src/include/perspective/config.h @@ -154,8 +154,8 @@ class PERSPECTIVE_EXPORT t_config { t_totals m_totals; std::map m_detail_colmap; bool m_has_pkey_agg; - t_uindex m_row_expand_depth; - t_uindex m_col_expand_depth; + // t_uindex m_row_expand_depth; + // t_uindex m_col_expand_depth; t_filter_op m_combiner; std::vector m_fterms; bool m_handle_nan_sort; diff --git a/src/include/perspective/port.h b/src/include/perspective/port.h index 0afee67dce..e120b0c917 100644 --- a/src/include/perspective/port.h +++ b/src/include/perspective/port.h @@ -37,7 +37,7 @@ class PERSPECTIVE_EXPORT t_port { void release_or_clear(); private: - t_port_mode m_mode; + // t_port_mode m_mode; t_schema m_schema; bool m_init; std::shared_ptr m_table; diff --git a/src/include/perspective/schema_column.h b/src/include/perspective/schema_column.h index 3e65725bed..db82659b1f 100644 --- a/src/include/perspective/schema_column.h +++ b/src/include/perspective/schema_column.h @@ -23,7 +23,6 @@ class t_schema_column { std::string m_tblname; std::string m_name; std::string m_altname; - t_dtype m_dtype; }; } // end namespace perspective diff --git a/src/include/perspective/sparse_tree.h b/src/include/perspective/sparse_tree.h index 4ee1c09465..f571deb72a 100644 --- a/src/include/perspective/sparse_tree.h +++ b/src/include/perspective/sparse_tree.h @@ -318,7 +318,6 @@ class PERSPECTIVE_EXPORT t_stree { std::set m_newleaves; t_sidxmap m_smap; std::vector m_aggcols; - t_uindex m_dotcount; std::shared_ptr m_deltas; std::vector m_minmax; t_tree_unify_rec_vec m_tree_unification_records; diff --git a/src/include/perspective/traversal.h b/src/include/perspective/traversal.h index 297bd51f2c..11ece7e8c7 100644 --- a/src/include/perspective/traversal.h +++ b/src/include/perspective/traversal.h @@ -20,6 +20,7 @@ #include #include #include +#include #include SUPPRESS_WARNINGS_VC(4503) @@ -110,7 +111,6 @@ class t_traversal { private: std::shared_ptr m_tree; std::shared_ptr> m_nodes; - t_index m_curidx; bool m_handle_nan_sort; }; @@ -174,7 +174,7 @@ t_traversal::sort_by(const t_config& config, const std::vector& sort t_multisorter sorter(sortelems, sort_orders, m_handle_nan_sort); argsort(sorted_idx, sorter); - auto nchild = n_changed; + std::int32_t nchild = n_changed; t_index ndesc = head.m_ndesc; // Fast path - if none of heads children are