Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Commit f5839ff

Browse files
committed
Fix warnings.
Signed-off-by: ienkovich <[email protected]>
1 parent 4874999 commit f5839ff

File tree

5 files changed

+6
-48
lines changed

5 files changed

+6
-48
lines changed

omniscidb/ArrowStorage/ArrowStorage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ void ArrowStorage::materializeDictionary(DictionaryData* dict) {
478478
VLOG(1) << "Materialized string dictionary for column " << col_id << " in table "
479479
<< table_id;
480480
for (auto& frag : table.fragments) {
481-
CHECK_LT(col_id, frag.metadata.size());
481+
CHECK_LT(static_cast<size_t>(col_id), frag.metadata.size());
482482
auto& meta = frag.metadata[col_id];
483483
// compute chunk stats is multi threaded, so we single thread this
484484
meta->fillChunkStats(

omniscidb/QueryEngine/JoinHashTable/Runtime/HashJoinRuntime.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,8 @@ DEVICE void SUFFIX(init_hash_join_buff)(int32_t* groups_buffer,
188188
[=](const tbb::blocked_range<int64_t>& r) {
189189
const auto start_idx = r.begin();
190190
const auto end_idx = r.end();
191-
for (auto entry_idx = start_idx; entry_idx != end_idx;
192-
++entry_idx) {
193-
groups_buffer[entry_idx] = invalid_slot_val;
194-
}
191+
init_hash_join_buff_cpu(
192+
groups_buffer, invalid_slot_val, start_idx, end_idx);
195193
});
196194
#endif
197195
}

omniscidb/QueryEngine/RowFuncBuilder.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,7 +993,6 @@ bool RowFuncBuilder::codegenShuffle(
993993
partition_byte_streams,
994994
LL_INT(target_idx)),
995995
"target_byte_stream_" + std::to_string(target_idx));
996-
size_t chosen_bytes = query_mem_desc.getPaddedSlotWidthBytes(target_idx);
997996

998997
target_builder(target_expr, executor_, query_mem_desc, co);
999998
target_builder.codegenSingleTarget(this,

omniscidb/ResultSet/ArrowResultSetConverter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1372,7 +1372,7 @@ std::shared_ptr<arrow::Table> ArrowResultSetConverter::getArrowTable(
13721372
? results_->entryCount()
13731373
: std::min(size_t(top_n_), results_->entryCount());
13741374

1375-
CHECK_GT(entry_count, 0);
1375+
CHECK_GT(entry_count, (size_t)0);
13761376

13771377
std::vector<ColumnBuilder> builders(col_count);
13781378
for (size_t col_idx = 0; col_idx < col_count; ++col_idx) {
@@ -1455,7 +1455,7 @@ std::shared_ptr<arrow::Table> ArrowResultSetConverter::getArrowTable(
14551455
for (size_t i = 0; i < col_count; i++) {
14561456
row_size_bytes += results_->colType(i)->size();
14571457
}
1458-
CHECK_GT(row_size_bytes, 0);
1458+
CHECK_GT(row_size_bytes, (size_t)0);
14591459

14601460
const size_t stride = std::clamp(entry_count / cpu_threads() / 2,
14611461
65536 / row_size_bytes,
@@ -1797,7 +1797,7 @@ void ArrowResultSetConverter::initializeColumnBuilder(
17971797
const auto& unique_strings = unique_ids_and_strings.second;
17981798
ARROW_THROW_NOT_OK(str_array_builder.AppendValues(unique_strings));
17991799
const int32_t num_unique_strings = unique_strings.size();
1800-
CHECK_EQ(num_unique_strings, unique_ids.size());
1800+
CHECK_EQ(static_cast<size_t>(num_unique_strings), unique_ids.size());
18011801
// We need to remap ALL string id values given the Arrow dictionary
18021802
// will have "holes", i.e. it is a sparse representation of the underlying
18031803
// StringDictionary

omniscidb/Tests/ResultSetArrowConversion.cpp

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -60,45 +60,6 @@ using namespace ArrowTestHelpers;
6060
// HELPERS
6161
namespace {
6262

63-
// Processes command line args
64-
void parse_cli_args(int argc, char* argv[], ConfigPtr config) {
65-
namespace po = boost::program_options;
66-
67-
po::options_description desc("Options");
68-
69-
desc.add_options()("help,h", "Print help messages ");
70-
desc.add_options()("enable-columnar-output",
71-
po::value<bool>(&config->rs.enable_columnar_output)
72-
->default_value(config->rs.enable_columnar_output),
73-
"Enable columnar_output");
74-
desc.add_options()("cpu-only",
75-
po::value<bool>(&config->exec.cpu_only)
76-
->default_value(config->exec.cpu_only)
77-
->implicit_value(true));
78-
79-
logger::LogOptions log_options(argv[0]);
80-
log_options.severity_ = logger::Severity::FATAL;
81-
log_options.set_options(); // update default values
82-
desc.add(log_options.get_options());
83-
84-
try {
85-
po::variables_map vm;
86-
po::store(po::command_line_parser(argc, argv).options(desc).run(), vm);
87-
po::notify(vm);
88-
89-
if (vm.count("help")) {
90-
std::cout << desc;
91-
std::exit(EXIT_SUCCESS);
92-
}
93-
94-
logger::init(log_options);
95-
} catch (boost::program_options::error& e) {
96-
std::cerr << "Usage Error: " << e.what() << std::endl;
97-
std::cout << desc;
98-
std::exit(EXIT_FAILURE);
99-
}
100-
}
101-
10263
std::string getFilePath(const std::string& file_name) {
10364
return TEST_SOURCE_PATH + std::string("/EmbeddedDataFiles/") + file_name;
10465
}

0 commit comments

Comments
 (0)