setop
/
sqlite-parquet-vtable
mirror of https://github.com/cldellow/sqlite-parquet-vtable.git
1
0
Fork 0
Code Releases Activity

WIP on making build work on Ubuntu 16.04 

See comment at https://github.com/cldellow/sqlite-parquet-vtable/pull/39#issuecomment-553983872
in https://github.com/cldellow/sqlite-parquet-vtable/pull/39 for log messages.

I think I need to refactor the `-I` directives -- I think when I updated them to
fix finding compression library headers, I brought in an internal set of arrow
includes, perhaps?
This commit is contained in:
Ubuntu 2019-11-14 17:06:49 +00:00
parent 3085bb34b3
commit 897c4538fa
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/Makefile.linux
View File

@ -44,7 +44,7 @@ CC = gcc
CXX = g++ CXX = g++
OPTIMIZATIONS = -O3 OPTIMIZATIONS = -O3
CPUS:=$(shell nproc) CPUS:=$(shell nproc)
CFLAGS = -I $(SQLITE) -I $(PARQUET_CPP)/arrow_ep-prefix/src/arrow_ep/cpp/src -I $(PARQUET_CPP)/src -I $(ARROW)/cpp/src $(OPTIMIZATIONS) -std=c++11 -Wall -fPIC -g CFLAGS = -I $(SQLITE) -I $(ARROW)/cpp/src -I $(PARQUET_CPP)/arrow_ep-prefix/src/arrow_ep/cpp/src -I $(PARQUET_CPP)/src $(OPTIMIZATIONS) -std=c++11 -Wall -fPIC -g
ALL_LIBS = $(PARQUET_CPP_LIB) $(LZ4_LIB) $(ZSTD_LIB) $(THRIFT_LIB) $(SNAPPY_LIB) $(ARROW_LIB) \ ALL_LIBS = $(PARQUET_CPP_LIB) $(LZ4_LIB) $(ZSTD_LIB) $(THRIFT_LIB) $(SNAPPY_LIB) $(ARROW_LIB) \
$(ICU_I18N_LIB) $(ICU_UC_LIB) $(ICU_DATA_LIB) \ $(ICU_I18N_LIB) $(ICU_UC_LIB) $(ICU_DATA_LIB) \

2
parquet/parquet_cursor.cc
View File

@ -775,6 +775,7 @@ void ParquetCursor::ensureColumn(int col) {
case parquet::Type::INT64: case parquet::Type::INT64:
{ {
parquet::Int64Scanner* s = (parquet::Int64Scanner*)scanners[col].get(); parquet::Int64Scanner* s = (parquet::Int64Scanner*)scanners[col].get();
//long rv = 0;
long long rv = 0; long long rv = 0;
s->NextValue(&rv, &wasNull); s->NextValue(&rv, &wasNull);
break; break;
@ -859,6 +860,7 @@ void ParquetCursor::ensureColumn(int col) {
case parquet::Type::INT64: case parquet::Type::INT64:
{ {
parquet::Int64Scanner* s = (parquet::Int64Scanner*)scanners[col].get(); parquet::Int64Scanner* s = (parquet::Int64Scanner*)scanners[col].get();
//long rv = 0;
long long rv = 0; long long rv = 0;
hadValue = s->NextValue(&rv, &wasNull); hadValue = s->NextValue(&rv, &wasNull);
colIntValues[col] = rv; colIntValues[col] = rv;