Update from original #1
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
….2.3 This PR supercedes #871 (repo fork for that one was deleted) Author: Matt Darwin <(none)> Closes #879 from mattdarwin/ARROW-1240-upgrade-logback and squashes the following commits: caed163 [Matt Darwin] upgrading slf4j to 1.7.25
The changes here expose the ability to set "lastSet" on Nullable<var length>Vector. I believe this is needed only for NullableVarCharVector and NullableVarBinaryVector. Hence the API is exposed through NullableValueVectors.java Author: siddharth <[email protected]> Closes #868 from siddharthteotia/ARROW-1237 and squashes the following commits: 786dfea [siddharth] ARROW-1237: addressed review comments and added more tests 73b2fc5 [siddharth] ARROW-1237: added some unit tests f8c7277 [siddharth] ARROW-1237: expose the ability to set lastSet
Currently used version of the git-commit-id-plugin maven plugin (2.1.9) doesn't work with recent git structures. This is for majority of the users not manifested since Arrow has the java maven root in the project subdirectory (`/java`) instead of top level so this plugin normally doesn't kick in if maven is executed from the subdirectory (usual case - ie `cd java; mvn install` - works fine) as the plugin doesn't see the `.git` directory but it does kick in and fail if executed from the main arrow top level dir as `mvn -f java/pom.xml install` (where the `.git` sits): ``` $ mvn -f java/pom.xml package ... [ERROR] Failed to execute goal pl.project13.maven:git-commit-id-plugin:2.1.9:revision (for-jars) on project arrow-java-root: Execution for-jars of goal pl.project13.maven:git-commit-id-plugin:2.1.9:revision failed: Bare Repository has neither a working tree, nor an index -> [Help 1] ``` Simple fix is upgrading the plugin to recent version (the minimal working version appears to be 2.1.13). This is required for seamless integration with Jenkins (ARROW-1234). Author: Antony Mayi <[email protected]> Closes #869 from antonymayi/master and squashes the following commits: 6976ee0 [Antony Mayi] ARROW-1239 - upgrading git-commit-id-plugin
This PR introduces a Cython API to Plasma, a FindPlasma.cmake to make it easier to integrate Plasma with CMake projects and sets up packaging with pyarrow. Author: Philipp Moritz <[email protected]> Author: Robert Nishihara <[email protected]> Closes #797 from pcmoritz/plasma-cython and squashes the following commits: d8319fc [Philipp Moritz] get for of PlasmaClient.connect d14ab87 [Philipp Moritz] get rid of MutableBuffer 08f24a5 [Philipp Moritz] fix typos and move FixedSizeBufferOutputStream e33443d [Philipp Moritz] fix setup.py develop for plasma 5f7b779 [Philipp Moritz] changes needed to make Ray work with Plasma in Arrow b9e2dee [Philipp Moritz] fix windows build 3e4a84d [Philipp Moritz] fix segfault 0bea267 [Philipp Moritz] debug 23fe5f5 [Philipp Moritz] make plasma store binary part of the pyarrow package for tests b863d13 [Philipp Moritz] fix 997de1e [Philipp Moritz] fix 47dc739 [Philipp Moritz] fixes 47033e7 [Philipp Moritz] switch to pytest ed84c53 [Philipp Moritz] partial fixes 9bc5c15 [Philipp Moritz] implement wait and fetch for the client 45f338f [Philipp Moritz] test plasma on macOS 8b53618 [Philipp Moritz] fix 54f595e [Philipp Moritz] try fixing python 2 tests 2c6d652 [Philipp Moritz] convert docs to numpy format 3270628 [Philipp Moritz] try to get documentation up 44d1a55 [Philipp Moritz] cleanups and release GIL a9f6502 [Philipp Moritz] more fixes 1ff88e7 [Philipp Moritz] fix travix ci 348f9bf [Philipp Moritz] fixes 4ae1a27 [Philipp Moritz] fix fd80203 [Philipp Moritz] Plasma Python extension packaging: It compiles! 3b69973 [Robert Nishihara] Fixed minor python linting. c9f6bcf [Robert Nishihara] Fix indentation and line lengths in plasma.pyx. 67b0951 [Robert Nishihara] Fix long lines in plasma/test/test.py. e26527c [Robert Nishihara] Convert plasma test.py from 2 space indentation to 4 space indentation. acc71d2 [Philipp Moritz] add round trip test for dataframes 2b7f949 [Philipp Moritz] implement mutable arrow python buffers c06f1b5 [Philipp Moritz] fix test 1d7928f [Philipp Moritz] add arrow roundtrip test 6371e2e [Philipp Moritz] fix tests 3021d59 [Philipp Moritz] make ObjectID pickleable dd5a7d8 [Philipp Moritz] fix tests 777e9c7 [Philipp Moritz] introduce plasma namespace a4a9628 [Philipp Moritz] fix c++ tests 924888b [Philipp Moritz] update f970df3 [Philipp Moritz] reduce logging 2ff2480 [Philipp Moritz] workaround for python visibility d4934a9 [Philipp Moritz] update cba92c1 [Philipp Moritz] setup.py for plasma 066d0ea [Philipp Moritz] test 1aea320 [Philipp Moritz] run plasma tests 3c4de52 [Philipp Moritz] use cmake to build the cython extension bf39297 [Philipp Moritz] build and install pyarrow for plasma tests 5bf722a [Philipp Moritz] fix plasma path 1c5434c [Philipp Moritz] fix formatting 187cc24 [Philipp Moritz] add travis tests c3d462d [Philipp Moritz] remove Python C extension d9261b4 [Philipp Moritz] add documentation and license db2d09a [Philipp Moritz] get all python tests in place 78d08ac [Philipp Moritz] make eviction work in Cython 18e0ac4 [Philipp Moritz] get tests bc681ca [Philipp Moritz] port some python tests f8e05f2 [Philipp Moritz] implement plasma.get in the cython client d590c8a [Philipp Moritz] update 5178ee7 [Philipp Moritz] update 9044a01 [Philipp Moritz] initial plasma cython client commit
… sizes on Windows Author: Max Risuhin <[email protected]> Closes #877 from MaxRis/ARROW-1195 and squashes the following commits: 675d584 [Max Risuhin] ARROW-1195: [C++] CpuInfo init with cores number, frequency and cache sizes on Windows
…ectors This will allow us to do some cleanup in Dremio where we have written wrapper routines using Reflection to access the fillEmpties method of mutator. Unit tests have been added. Author: siddharth <[email protected]> Closes #880 from siddharthteotia/ARROW-1249 and squashes the following commits: e0532c5 [siddharth] Merge branch 'ARROW-1249' of https://github.com/siddharthteotia/arrow into ARROW-1249 dc05206 [siddharth] ARROW-1249: Expose fillEmpties() from Nullable Variable Length Vectors f24d8f1 [siddharth] ARROW-1249: expose fillEmpties from Nullable variable length vectors
Author: Philipp Moritz <[email protected]> Closes #882 from pcmoritz/plasma-test-speedup and squashes the following commits: 09ffbdf [Philipp Moritz] speed up plasma tests
JavaTester was commented out, probably accidentally from a previous commit, this re-enables it. Author: Bryan Cutler <[email protected]> Closes #875 from BryanCutler/enable-java-integration-ARROW-1245 and squashes the following commits: c08c6e2 [Bryan Cutler] enabled JavaTester in integration tests
Author: Wes McKinney <[email protected]> Closes #876 from wesm/ARROW-1246 and squashes the following commits: 98790df [Wes McKinney] Review feedback to clarify nullability of map components 346b48d [Wes McKinney] Typo 06ae8eb [Wes McKinney] Draft Flatbuffer metadata for Map
Author: Philipp Moritz <[email protected]> Closes #883 from pcmoritz/plasma-client-connect and squashes the following commits: 667629f [Philipp Moritz] cleanup 886beab [Philipp Moritz] create factory method for connecting to the plasma client 09ffbdf [Philipp Moritz] speed up plasma tests
Our coding style guide has a ton of rules. I put up this patch to discuss since we don't have too many patches outstanding right now. This uses the exact Google style used in TensorFlow and other projects, but relaxes the column limit to 90 characters.
The main change is horizontal alignment in function signatures:
```diff
void ValidateBasicStructArray(const StructArray* result,
- const vector<uint8_t>& struct_is_valid, const vector<char>& list_values,
- const vector<uint8_t>& list_is_valid, const vector<int>& list_lengths,
- const vector<int>& list_offsets, const vector<int32_t>& int_values) {
+ const vector<uint8_t>& struct_is_valid,
+ const vector<char>& list_values,
+ const vector<uint8_t>& list_is_valid,
+ const vector<int>& list_lengths,
+ const vector<int>& list_offsets,
+ const vector<int32_t>& int_values) {
```
I find the paren-aligned version a bit more readable, but it's a matter of taste
Author: Wes McKinney <[email protected]>
Closes #848 from wesm/google-style and squashes the following commits:
9e8fe4f [Wes McKinney] Move import to platform.h
8690257 [Wes McKinney] Use Google C++ code formatting
…ng the release Also updated the CHANGELOG.md Author: Wes McKinney <[email protected]> Closes #885 from wesm/ARROW-1252 and squashes the following commits: e603f38 [Wes McKinney] Fix up markdown formatting of underscores 797215b [Wes McKinney] Release announcement blog post 3babc7b [Wes McKinney] Add release page 3fd41e1 [Wes McKinney] First cut revising install page b8416ee [Wes McKinney] Add changelog to CHANGELOG.md 3f9dec0 [Wes McKinney] Start on 0.5.0 website updates
…forge toolchain for thirdparty libraries @pcmoritz I removed the travis_script_plasma.sh and combined the common bits with travis_script_python.sh; it seemed like there was some redundant work and would be easier to test everything in a single build. Let me know if I messed something up Author: Wes McKinney <[email protected]> Closes #884 from wesm/ARROW-1253 and squashes the following commits: 30a13ee [Wes McKinney] Formatting 28bc6be [Wes McKinney] Run unit tests from installed library fcf7940 [Wes McKinney] Prevent existing LD_LIBRARY_PATH from being blown away c67bb68 [Wes McKinney] Speed up C++ / Python builds by using conda-forge toolchain to avoid rebuilding EPs. Use ninja for builds when using toolchain
Change-Id: I290f70f8db4b553017e7976092ee5cefdbb14861
cc @pcmoritz Author: Wes McKinney <[email protected]> Closes #889 from wesm/ARROW-1258 and squashes the following commits: e9ecf10 [Wes McKinney] Set -Wno-conversion for dlmalloc on gcc builds 3a4ee47 [Wes McKinney] Suppress Clang dlmalloc compiler warnings
… clang builds I also removed some other unused CMake cruft from the build system. I think the warning is innocuous, but these symbols in question will only be callable from C++: ``` $ nm -g pyarrow/lib.cpython-35m-x86_64-linux-gnu.so | grep unwrap 0000000000055ef0 T pyarrow_unwrap_array 0000000000058590 T pyarrow_unwrap_batch 0000000000054690 T pyarrow_unwrap_buffer 0000000000057d90 T pyarrow_unwrap_column 0000000000054df0 T pyarrow_unwrap_data_type 0000000000055640 T pyarrow_unwrap_field 0000000000055af0 T pyarrow_unwrap_schema 0000000000058190 T pyarrow_unwrap_table 0000000000057880 T pyarrow_unwrap_tensor ``` Author: Wes McKinney <[email protected]> Closes #888 from wesm/ARROW-1248 and squashes the following commits: 986cf88 [Wes McKinney] Suppress return-type-c-linkage warning in Cython clang builds. Remove other python CMake cruft
…XXX in plasma protocol. Related to #878, add DCHECK for ReadXXX. Author: Yeolar <[email protected]> Closes #887 from Yeolar/fixtypo_plasma_and_add_DCHECK and squashes the following commits: 4df63bc [Yeolar] clang-format for too long lines. 143d254 [Yeolar] Update, compile passed. 09ff103 [Yeolar] Fix conflicts. b951d8d [Yeolar] Merge pull request #1 from apache/master ebae611 [Yeolar] Fix typo in plasma protocol; add DCHECK for ReadXXX in plasma protocol.
Closes #893 Change-Id: I4f8279086788986fed3c7a65f2be95dfc4809c28
Author: Max Risuhin <[email protected]> Closes #894 from MaxRis/ARROW-1275 and squashes the following commits: 3dcf216 [Max Risuhin] ARROW-1275: [C++] Deafult Snappy static lib suffix updated to "_static"
Adding blog post to highlight some of the work done in integrating Arrow with Spark for `toPandas()` Author: Bryan Cutler <[email protected]> Closes #897 from BryanCutler/spark-blogpost-ARROW-1268 and squashes the following commits: 1f8dffd [Bryan Cutler] fixes and adding collaborators 2fa3587 [Bryan Cutler] fixed spelling and formatting 6a14066 [Bryan Cutler] Added blogpost for Spark integration toPandas()
…ss ExternalProject output The default is the current behavior, but if enabled the build output will log ExternalProject build progress to files instead of dumping everything to the console. It might be nice to change the default to ON but we could do that in a separate patch Author: Wes McKinney <[email protected]> Closes #891 from wesm/ARROW-1274 and squashes the following commits: a43d4e8 [Wes McKinney] Set verbose externalproject logging to true 10f8e92 [Wes McKinney] Fix CMake >= 3.3 warning. Also add option for verbose ExternalProject logging, otherwise suppress
…ag for lz4 and zstd libs Author: Max Risuhin <[email protected]> Closes #896 from MaxRis/ARROW-1204 and squashes the following commits: 280b5e3 [Max Risuhin] ARROW-1204: [C++] Remove WholeProgramOptimization(/GL) compilation flag for lz4 and zstd libs
Author: Wes McKinney <[email protected]> Closes #900 from wesm/fix-license-headers and squashes the following commits: 73941bf [Wes McKinney] Fix many license headers to use proper ASF one
… single Parquet file fails cc @jreback Author: Wes McKinney <[email protected]> Closes #902 from wesm/ARROW-1285 and squashes the following commits: b8f9ef4 [Wes McKinney] Delete any incomplete file when attempt to write single Parquet file fails
Fixes ARROW-1276 and fixes Python dev. documentation (encountered during the preparation of this PR). Author: Marco Neumann <[email protected]> Closes #906 from crepererum/ARROW-1276 and squashes the following commits: 1c1c92c [Marco Neumann] ARROW-1276: enable parquet serialization of empty DataFrames 1d9cc41 [Marco Neumann] add missing conda packages to python dev. doc
…and Python We aren't testing this in Travis CI because spinning up an HDFS cluster is a bit heavy weight, but this will at least enable us to do easier ongoing validation that this functionality is working properly. Author: Wes McKinney <[email protected]> Closes #895 from wesm/ARROW-1281 and squashes the following commits: a96e166 [Wes McKinney] Fix header 4effee7 [Wes McKinney] Fix license header d12eea4 [Wes McKinney] Fix license headers 591e7c6 [Wes McKinney] Add Python tests bbbd8c1 [Wes McKinney] Docker HDFS testing scripts, use hdfs-client.xml from Apache HAWQ (incubating)
Contributed by Stepan Kadlec <[email protected]> Closes #899 Change-Id: I3ad6cb9cc30946fda76e2dd454e0e19966276abc
…::BufferBuilder as in array builders Kind of an embarrassing oversight, but it's good that we caught it. In a test for incrementally building a BinaryArray, this yields about 4x speedup ``` Benchmark Time CPU Iterations --------------------------------------------------------------------------- BM_BuildBinaryArray/repeats:3 11892 us 11892 us 59 840.886MB/s BM_BuildBinaryArray/repeats:3 11903 us 11904 us 59 840.082MB/s BM_BuildBinaryArray/repeats:3 11909 us 11910 us 59 839.662MB/s BM_BuildBinaryArray/repeats:3_mean 11902 us 11902 us 59 840.21MB/s BM_BuildBinaryArray/repeats:3_stddev 7 us 7 us 0 520.137kB/s ``` before: ``` Benchmark Time CPU Iterations --------------------------------------------------------------------------- BM_BuildBinaryArray/repeats:3 45678 us 45571 us 15 219.439MB/s BM_BuildBinaryArray/repeats:3 45416 us 45209 us 15 221.197MB/s BM_BuildBinaryArray/repeats:3 45227 us 45122 us 15 221.619MB/s BM_BuildBinaryArray/repeats:3_mean 45440 us 45301 us 15 220.752MB/s BM_BuildBinaryArray/repeats:3_stddev 185 us 194 us 0 966.716kB/s ``` Author: Wes McKinney <[email protected]> Closes #905 from wesm/ARROW-1290 and squashes the following commits: 59d4d9c [Wes McKinney] Double buffer size when exceeding capacity in arrow::BufferBuilder, like in other array builder classes
…ce functions cc @xhochy @cpcloud for feedback on API Author: Wes McKinney <[email protected]> Closes #904 from wesm/ARROW-1273 and squashes the following commits: 1372565 [Wes McKinney] Add Parquet read_metadata, read_schema convenience functions
…mantics of --with-parquet Now the test suite does not fail if you build the Plasma libraries but forget to pass `--with-plasma` to the Python build Author: Wes McKinney <[email protected]> Closes #903 from wesm/ARROW-1289 and squashes the following commits: 0e9ce78 [Wes McKinney] Add PYARROW_BUILD_PLASMA CMake option, make plasma build work like parquet build
@jacques-n @StevenMPhillips PR for the change: dremio@b794dfa A new unit test has been added on top of original change. Author: Steven Phillips <[email protected]> Author: siddharth <[email protected]> Closes #890 from siddharthteotia/ARROW-1267-PR and squashes the following commits: 89a08d9 [siddharth] Handle zero length in BitVector.splitAndTransfer 84946b7 [Steven Phillips] Handle zero length case in BitVector.splitAndTransfer() b55c146 [Steven Phillips] Handle zero length case in BitVector.splitAndTransfer()
…not Bas… Fixing the inheritance tree: Nullable <Fixed-length | Var-Length>Vectors do not use "ArrowBuf data" field in BaseDataValueVector. Therefore, they should extend BaseValueVector class.. Author: siddharth <[email protected]> Closes #892 from siddharthteotia/ARROW-276 and squashes the following commits: d919538 [siddharth] ARROW-276: Nullable Vectors should extend BaseValueVector and not BaseDataValueVector
…Union Vectors. @jacques-n @StevenMPhillips PR for the original change-set dremio@75396ba with corresponding unit tests. Author: siddharth <[email protected]> Author: Steven Phillips <[email protected]> Closes #901 from siddharthteotia/ARROW-1192-PR and squashes the following commits: 3d89c99 [siddharth] ARROW-1192: splitAndTransfer changes for ListVector,UnionVector and corresponding unit tests 035e886 [Steven Phillips] Use buffer slice for splitAndTransfer in List and Union vectors
….seek I still need to validate this against the use case in dask/fastparquet#188 Author: Wes McKinney <[email protected]> Closes #907 from wesm/ARROW-1287 and squashes the following commits: 933f3f6 [Wes McKinney] Add testing script for checking thirdparty library against pyarrow.HdfsClient 423ca87 [Wes McKinney] Implement whence argument for pyarrow.NativeFile.seek
Author: Wes McKinney <[email protected]> Closes #908 from wesm/ARROW-968 and squashes the following commits: 47b71a5 [Wes McKinney] Support slices in RecordBatch.__getitem__
See conda-forge/cmake-feedstock#38. Not sure the origin of the build failure but we will pin at 3.8.0 for now Author: Wes McKinney <[email protected]> Closes #910 from wesm/ARROW-1294 and squashes the following commits: 69dfecc [Wes McKinney] Pin cmake=3.8.0 in MSVC toolchainbuild
…RecordBatch/Table.from_pandas Author: Wes McKinney <[email protected]> Closes #911 from wesm/ARROW-1291 and squashes the following commits: d442f3b [Wes McKinney] Cast non-string DataFrame columns to strings in RecordBatch/Table.from_pandas
… cannot connect to Plasma store cc @pcmoritz @robertnishihara Author: Wes McKinney <[email protected]> Closes #912 from wesm/ARROW-1264 and squashes the following commits: bd134d7 [Wes McKinney] Add flags to disable certain classes of unit tests 1d9de77 [Wes McKinney] Raise exception in Python instead of aborting if cannot connect to Plasma store
… and -Werror in CI Author: Wes McKinney <[email protected]> Closes #913 from wesm/ARROW-932 and squashes the following commits: 9534ae9 [Wes McKinney] Only pass PYARROW_CXXFLAGS when set dedcbb9 [Wes McKinney] Fix typo b5a6d9a [Wes McKinney] Supress another clang warning 2e8f105 [Wes McKinney] typo 5740f00 [Wes McKinney] Add PYARROW_CXXFLAGS option, fix MSVC compiler warnings c32ee09 [Wes McKinney] Remove print statement. Disable MSVC 4190 warning
…Dataset cc @yackoa Author: Wes McKinney <[email protected]> Closes #916 from wesm/ARROW-1213 and squashes the following commits: f8a0aff [Wes McKinney] Add HDFS section to API docs c54302d [Wes McKinney] Add deprecation warning for HdfsClient 4d3e722 [Wes McKinney] Auto-wrap s3fs filesystem when using ParquetDataset 0be33bb [Wes McKinney] Implement os.walk emulation layer for s3fs 719f806 [Wes McKinney] Progress toward supporting s3fs in Parquet reader bbd664e [Wes McKinney] Refactor HdfsClient into pyarrow/hdfs.py. Add connect factory method. Rename to HadoopFilesystem. Add walk implementation for HDFS, base Parquet directory walker on that 4984a9d [Wes McKinney] Refactoring slightly 4c0bcf4 [Wes McKinney] Start on Dask filesystem wrapper, S3-Parquet dataset test case
…t esoteric exceptions in constructors Author: Wes McKinney <[email protected]> Closes #917 from wesm/ARROW-187 and squashes the following commits: 8424e96 [Wes McKinney] Typo 0bee93c [Wes McKinney] Add development style notes to C++ README, note about esoteric exceptions
Author: Wes McKinney <[email protected]> Closes #919 from wesm/ARROW-1251 and squashes the following commits: b069837 [Wes McKinney] Update C++ README to account for toolchain evolution
…nd output clean @pcmoritz this might be a little bit OCD since all of the valgrind warnings were for memory that was still reachable, but let me know what you think. Author: Wes McKinney <[email protected]> Closes #921 from wesm/ARROW-1265 and squashes the following commits: ac2e830 [Wes McKinney] Consistent function naming style for EventLoop methods 22f440f [Wes McKinney] clang-format 97dbd16 [Wes McKinney] Clean up all resources on SIGTERM to keep valgrind output clean
This also includes a fair bit of API normalization and cleaning. Author: Wes McKinney <[email protected]> Closes #926 from wesm/ARROW-1301 and squashes the following commits: bcc9310 [Wes McKinney] Add missing API 8bf51f5 [Wes McKinney] Add more filesystem methods, tests for HDFS 98847b5 [Wes McKinney] Some HDFS refactoring. Implement chmod, chown. Normalize Filesystem->FileSystem
This includes a fair bit of namespace scrubbing. Still lots more to do Author: Wes McKinney <[email protected]> Closes #918 from wesm/ARROW-884 and squashes the following commits: 7606dc5 [Wes McKinney] Typo and cpplint fixes 451eeb1 [Wes McKinney] Restore arrow::TypePtr define 6b7e632 [Wes McKinney] Fix function capitalization 97433bb [Wes McKinney] Exclude internal namespaces from generated Doxygen docs. Various cleanups of current API page to exclude internal details
mattdarwin
pushed a commit
that referenced
this pull request
Aug 8, 2017
…ties As per apache#872 I am upgrading Jackson to the latest version on the current train (2.7.1 --> 2.7.9) Author: Matt Darwin <(none)> Author: Matt <[email protected]> Closes apache#929 from mattdarwin/ARROW-1242-upgrade-jackson and squashes the following commits: d059517 [Matt Darwin] 1242 upgraing jackson to 2.7.9 bc3b6a0 [Matt] Merge pull request #1 from apache/master
mattdarwin
pushed a commit
that referenced
this pull request
Aug 9, 2017
NB this commit excludes Jackson and logback upgrades, since they are dealt with in 871 and 872 Author: Matt Darwin <(none)> Author: Matt Darwin <[email protected]> Author: Matt <[email protected]> Closes apache#873 from mattdarwin/upgrade-libs and squashes the following commits: 9b51f46 [Matt Darwin] Merge branch 'master' into upgrade-libs 284a4ce [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow 79550b1 [Matt Darwin] rolling back lilith to 0.9.44 since 8 doesn't support java 7 c63eef6 [Matt Darwin] Merge branch 'master' into upgrade-libs bc3b6a0 [Matt] Merge pull request #1 from apache/master 8599ba0 [Matt Darwin] backing out guava upgrade 80d81e6 [Matt Darwin] downgrading guava to 20 for java 7 compatibility 806f348 [Matt Darwin] Merge branch 'master' into upgrade-libs 8aafb7e [Matt Darwin] correcting indentation in BaseValueVector 94c1469 [Matt Darwin] upgrading netty to 4.0.49 cff5596 [Matt Darwin] reverting to netty 4.0.41.Final 568737d [Matt Darwin] switching to Collections from Guava for empty iterator c194e48 [Matt Darwin] upgraded hppc to 0.7.2 38be468 [Matt Darwin] upgrading libs except jackson and logback
mattdarwin
pushed a commit
that referenced
this pull request
Aug 14, 2017
…(take 2) sorry, this was still not fixed properly. logback version is separately specified in 2 places. Fixed properly this time. Author: Matt Darwin <(none)> Author: Matt <[email protected]> Closes apache#960 from mattdarwin/ARROW-1240-upgrade-logback and squashes the following commits: 3492f66 [Matt Darwin] upgrading logback in tools/pom.xml 206b48d [Matt Darwin] Merge branch 'master' into ARROW-1240-upgrade-logback 284a4ce [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow bc3b6a0 [Matt] Merge pull request #1 from apache/master 3e2f676 [Matt Darwin] Merge branch 'master' into ARROW-1240-upgrade-logback caed163 [Matt Darwin] upgrading slf4j to 1.7.25
mattdarwin
pushed a commit
that referenced
this pull request
Aug 14, 2017
…ties (take 2) sorry, PR apache#929 failed to actually change the Jackson version, since the `jackson.version` variable defined in java/pom.xml is not used in java/vector/pom.xml That's now fixed in this PR. Author: Matt Darwin <(none)> Author: Matt <[email protected]> Closes apache#957 from mattdarwin/ARROW-1242-upgrade-jackson and squashes the following commits: ad15e5f [Matt Darwin] Merge branch 'master' into ARROW-1242-upgrade-jackson ee29d65 [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow into ARROW-1242-upgrade-jackson 06d7745 [Matt Darwin] upgrading jackson to 2.7.9 PROPERLY this time... 284a4ce [Matt Darwin] Merge branch 'master' of https://github.com/apache/arrow d059517 [Matt Darwin] 1242 upgraing jackson to 2.7.9 bc3b6a0 [Matt] Merge pull request #1 from apache/master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.