PARQUET-519: Remove last of suppressed compiler warnings

Author: Wes McKinney <wesm@apache.org> Closes apache#69 from wesm/PARQUET-519 and squashes the following commits: cde787e [Wes McKinney] Initialize RleDecoder with encoded_len b8f0234 [Wes McKinney] Remove -Wno-unused-variable and fix compiler warnings Change-Id: I348d009c9ad415f248b0d53d86a652bbd9f524b5
wesm · Mar 2, 2016 · 4bcfb0e · 4bcfb0e
1 parent 853b128
commit 4bcfb0e
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 16 deletions.
diff --git a/cpp/src/parquet/column/levels-test.cc b/cpp/src/parquet/column/levels-test.cc
@@ -30,7 +30,6 @@ namespace parquet_cpp {
 
 void GenerateLevels(int min_repeat_factor, int max_repeat_factor,
     int max_level, std::vector<int16_t>& input_levels) {
-  int total_count = 0;
   // for each repetition count upto max_repeat_factor
   for (int repeat = min_repeat_factor; repeat <= max_repeat_factor; repeat++) {
     // repeat count increases by a factor of 2 for every iteration

diff --git a/cpp/src/parquet/column/levels.h b/cpp/src/parquet/column/levels.h
@@ -104,7 +104,6 @@ class LevelDecoder {
   int SetData(Encoding::type encoding, int16_t max_level,
       int num_buffered_values, const uint8_t* data) {
     uint32_t num_bytes = 0;
-    uint32_t total_bytes = 0;
     encoding_ = encoding;
     num_values_remaining_ = num_buffered_values;
     bit_width_ = BitUtil::Log2(max_level + 1);

diff --git a/cpp/src/parquet/column/test-util.h b/cpp/src/parquet/column/test-util.h
@@ -102,8 +102,6 @@ class DataPageBuilder {
     if (encoding != Encoding::PLAIN) {
       ParquetException::NYI("only plain encoding currently implemented");
     }
-    int bytes_to_encode = values.size() * sizeof(T);
-
     PlainEncoder<TYPE> encoder(d);
     encoder.Encode(&values[0], values.size(), sink_);
 
@@ -171,8 +169,6 @@ void DataPageBuilder<Type::BOOLEAN>::AppendValues(const ColumnDescriptor *d,
   if (encoding != Encoding::PLAIN) {
     ParquetException::NYI("only plain encoding currently implemented");
   }
-  int bytes_to_encode = values.size() * sizeof(bool);
-
   PlainEncoder<Type::BOOLEAN> encoder(d);
   encoder.Encode(values, values.size(), sink_);
 
@@ -186,8 +182,6 @@ static std::shared_ptr<DataPage> MakeDataPage(const ColumnDescriptor *d,
     const std::vector<T>& values,
     const std::vector<int16_t>& def_levels, int16_t max_def_level,
     const std::vector<int16_t>& rep_levels, int16_t max_rep_level) {
-  int num_values = values.size();
-
   InMemoryOutputStream page_stream;
   test::DataPageBuilder<TYPE> page_builder(&page_stream);
 

diff --git a/cpp/src/parquet/encodings/dictionary-encoding.h b/cpp/src/parquet/encodings/dictionary-encoding.h
@@ -314,7 +314,6 @@ inline void DictEncoder<T>::Put(const T& v) {
     index = hash_slots_[j];
   }
 
-  int bytes_added = 0;
   if (index == HASH_SLOT_EMPTY) {
     // Not in the hash table, so we insert it now
     index = uniques_.size();

diff --git a/cpp/src/parquet/encodings/encoding-test.cc b/cpp/src/parquet/encodings/encoding-test.cc
@@ -96,7 +96,6 @@ template <>
 void GenerateData<ByteArray>(int num_values, ByteArray* out, vector<uint8_t>* heap) {
   // seed the prng so failure is deterministic
   int max_byte_array_len = 12;
-  int num_bytes = max_byte_array_len + sizeof(uint32_t);
   heap->resize(num_values * max_byte_array_len);
   random_byte_array(num_values, 0, heap->data(), out, 2, max_byte_array_len);
 }

diff --git a/cpp/src/parquet/file/file-deserialize-test.cc b/cpp/src/parquet/file/file-deserialize-test.cc
@@ -77,7 +77,6 @@ class TestPageSerde : public ::testing::Test {
     // have meaningful data associated with them
 
     // Serialize the Page header
-    uint32_t serialized_len = max_serialized_len;
     page_header_.__set_data_page_header(data_page_header_);
     page_header_.uncompressed_page_size = uncompressed_size;
     page_header_.compressed_page_size = compressed_size;

diff --git a/cpp/src/parquet/file/reader.cc b/cpp/src/parquet/file/reader.cc
@@ -170,7 +170,6 @@ void ParquetFileReader::DebugPrint(std::ostream& stream, bool print_values) {
     vector<std::shared_ptr<Scanner> > scanners(num_columns, NULL);
     for (int i = 0; i < num_columns; ++i) {
       std::shared_ptr<ColumnReader> col_reader = group_reader->Column(i);
-      Type::type col_type = col_reader->type();
 
       std::stringstream ss;
       ss << "%-" << COL_WIDTH << "s";

diff --git a/cpp/src/parquet/thrift/CMakeLists.txt b/cpp/src/parquet/thrift/CMakeLists.txt
@@ -19,6 +19,9 @@ set(THRIFT_SRCS
   parquet_constants.cpp
   parquet_types.cpp)
 
+set_source_files_properties(parquet_types.cpp PROPERTIES
+  COMPILE_FLAGS -Wno-unused-variable)
+
 add_library(parquet_thrift STATIC
   ${THRIFT_SRCS}
 )

diff --git a/cpp/src/parquet/util/rle-test.cc b/cpp/src/parquet/util/rle-test.cc
@@ -221,10 +221,9 @@ bool CheckRoundTrip(const vector<int>& values, int bit_width) {
   int encoded_len = encoder.Flush();
   int out;
 
-  RleDecoder decoder(buffer, len, bit_width);
+  RleDecoder decoder(buffer, encoded_len, bit_width);
   for (size_t i = 0; i < values.size(); ++i) {
-    uint64_t val;
-    bool result = decoder.Get(&out);
+    EXPECT_TRUE(decoder.Get(&out));
     if (values[i] != out) {
       return false;
     }
@@ -354,7 +353,6 @@ TEST(BitRle, Random) {
   std::random_device rd;
   std::uniform_int_distribution<int> dist(1, 20);
 
-  uint32_t seed = 0;
   for (int iter = 0; iter < niters; ++iter) {
     // generate a seed with device entropy
     uint32_t seed = rd();