orc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject orc git commit: ORC-70. Add back travis ci (xunzhang via omalley)
Date Fri, 29 Jul 2016 23:33:04 GMT
Repository: orc
Updated Branches:
  refs/heads/master b2f84ce49 -> 1253aff23


ORC-70. Add back travis ci (xunzhang via omalley)

Fixes #39

Signed-off-by: Owen O'Malley <omalley@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/1253aff2
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/1253aff2
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/1253aff2

Branch: refs/heads/master
Commit: 1253aff23ef874edad434d9875ea288256ae70f1
Parents: b2f84ce
Author: Owen O'Malley <omalley@apache.org>
Authored: Fri Jul 29 15:37:25 2016 -0700
Committer: Owen O'Malley <omalley@apache.org>
Committed: Fri Jul 29 16:32:02 2016 -0700

----------------------------------------------------------------------
 .travis.yml            | 16 ++++++++++++++++
 README.md              |  5 ++++-
 c++/src/Reader.cc      |  8 ++++----
 c++/src/TypeImpl.cc    |  2 +-
 tools/test/ToolTest.cc |  8 ++++----
 5 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/orc/blob/1253aff2/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..3149d2f
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,16 @@
+language: cpp
+compiler:
+  - gcc
+  - clang
+before_install:
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo apt-get -qq update
+  - sudo apt-get -qq install g++-4.8
+install:
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
+before_script:
+  - mkdir build
+  - cd build
+  - cmake ..
+script:
+  - make package test-out

http://git-wip-us.apache.org/repos/asf/orc/blob/1253aff2/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 349d0b3..c34b187 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,10 @@ a C++ library for reading the _Optimized Row Columnar_ (ORC) file
 format. The C++ and Java libraries are completely independent of each
 other and will each read all versions of ORC files.
 
-### Building
+The current build status:
+* Apache ORC master ![master build status](https://travis-ci.org/apache/orc.svg?branch=master)
+
+### Building 
 
 * Install java 1.7 or higher
 * Install maven 3 or higher

http://git-wip-us.apache.org/repos/asf/orc/blob/1253aff2/c++/src/Reader.cc
----------------------------------------------------------------------
diff --git a/c++/src/Reader.cc b/c++/src/Reader.cc
index e5c886b..62489e7 100644
--- a/c++/src/Reader.cc
+++ b/c++/src/Reader.cc
@@ -39,7 +39,7 @@
 namespace orc {
 
   std::string compressionKindToString(CompressionKind kind) {
-    switch (kind) {
+    switch (static_cast<int>(kind)) {
     case CompressionKind_NONE:
       return "none";
     case CompressionKind_ZLIB:
@@ -59,7 +59,7 @@ namespace orc {
   }
 
   std::string writerVersionToString(WriterVersion version) {
-    switch (version) {
+    switch (static_cast<int>(version)) {
     case WriterVersion_ORIGINAL:
       return "original";
     case WriterVersion_HIVE_8732:
@@ -785,7 +785,7 @@ namespace orc {
   };
 
   std::string streamKindToString(StreamKind kind) {
-    switch (kind) {
+    switch (static_cast<int>(kind)) {
     case StreamKind_PRESENT:
       return "present";
     case StreamKind_DATA:
@@ -809,7 +809,7 @@ namespace orc {
   }
 
   std::string columnEncodingKindToString(ColumnEncodingKind kind) {
-    switch (kind) {
+    switch (static_cast<int>(kind)) {
     case ColumnEncodingKind_DIRECT:
       return "direct";
     case ColumnEncodingKind_DICTIONARY:

http://git-wip-us.apache.org/repos/asf/orc/blob/1253aff2/c++/src/TypeImpl.cc
----------------------------------------------------------------------
diff --git a/c++/src/TypeImpl.cc b/c++/src/TypeImpl.cc
index 2690e6e..fdf66a0 100644
--- a/c++/src/TypeImpl.cc
+++ b/c++/src/TypeImpl.cc
@@ -420,7 +420,7 @@ namespace orc {
     }
 
     TypeImpl* result;
-    switch (fileType->getKind()) {
+    switch (static_cast<int>(fileType->getKind())) {
     case BOOLEAN:
     case BYTE:
     case SHORT:

http://git-wip-us.apache.org/repos/asf/orc/blob/1253aff2/tools/test/ToolTest.cc
----------------------------------------------------------------------
diff --git a/tools/test/ToolTest.cc b/tools/test/ToolTest.cc
index 8695a9f..01132f6 100644
--- a/tools/test/ToolTest.cc
+++ b/tools/test/ToolTest.cc
@@ -78,8 +78,8 @@ std::string getFileContents(const char *filename) {
  * returned as the result.
  */
 int runProgram(const std::vector<std::string>& command,
-               std::string &stdout,
-               std::string &stderr) {
+               std::string &out,
+               std::string &err) {
 
   // create temporary filenames for stdout and stderr
   char *stdoutName = strdup("/tmp/orc-test-stdout-XXXXXXXX");
@@ -167,11 +167,11 @@ int runProgram(const std::vector<std::string>& command,
     }
     exit(1);
   }
-  stdout = getFileContents(stdoutName);
+  out = getFileContents(stdoutName);
   if (std::remove(stdoutName) != 0) {
     std::cerr << "Failed to remove " << stdoutName << "\n";
   }
-  stderr = getFileContents(stderrName);
+  err = getFileContents(stderrName);
   if (std::remove(stderrName) != 0) {
     std::cerr << "Failed to remove " << stderrName << "\n";
   }


Mime
View raw message