Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: xerial/snappy-java
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.0.5
Choose a base ref
...
head repository: xerial/snappy-java
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.10.4
Choose a head ref
Loading
Showing with 16,427 additions and 4,161 deletions.
  1. +2 −0 .git-blame-ignore-revs
  2. +2 −0 .gitattributes
  3. +9 −0 .github/dependabot.yml
  4. +55 −0 .github/release-drafter.yml
  5. +31 −0 .github/release.yml
  6. +48 −0 .github/workflows/build-native.yml
  7. +27 −0 .github/workflows/release-drafter.yml
  8. +18 −0 .github/workflows/release-note.yml
  9. +37 −0 .github/workflows/release.yml
  10. +39 −0 .github/workflows/snapshot.yml
  11. +78 −0 .github/workflows/test.yml
  12. +7 −0 .gitignore
  13. +5 −0 .scalafmt.conf
  14. +0 −6 .settings/org.eclipse.jdt.core.prefs
  15. +0 −4 .settings/org.eclipse.jdt.ui.prefs
  16. +0 −9 .settings/org.maven.ide.eclipse.prefs
  17. +19 −0 .travis.yml
  18. +119 −0 BUILD.md
  19. +0 −78 INSTALL
  20. +177 −66 Makefile
  21. +242 −64 Makefile.common
  22. +3 −3 Makefile.package
  23. +187 −6 Milestone.md
  24. +10 −2 NOTICE
  25. +143 −65 README.md
  26. +12 −0 SECURITY.md
  27. +123 −0 build.sbt
  28. +41 −0 docker/Dockerfile.centos5-linux-x86_64-pic
  29. +55 −0 docker/Dockerfile.linux-ppc64
  30. +9 −0 docker/Makefile
  31. +15 −0 docker/Toolchain-ppc64.cmake
  32. +200 −0 docker/dockcross-aarch64
  33. +279 −0 docker/dockcross-android-arm
  34. +278 −0 docker/dockcross-android-arm64
  35. +242 −0 docker/dockcross-arm64
  36. +200 −0 docker/dockcross-armv5
  37. +200 −0 docker/dockcross-armv6
  38. +278 −0 docker/dockcross-armv7
  39. +200 −0 docker/dockcross-ppc64
  40. +200 −0 docker/dockcross-ppc64le
  41. +200 −0 docker/dockcross-riscv64
  42. +199 −0 docker/dockcross-s390x
  43. +200 −0 docker/dockcross-windows-x64
  44. +200 −0 docker/dockcross-windows-x86
  45. +0 −248 googlecode_upload.py
  46. +53 −0 lib/inc_ibm/jni_md.h
  47. +56 −0 lib/inc_ibm/jniport.h
  48. +62 −0 lib/inc_linux/config.h
  49. +1,960 −0 lib/inc_linux/jni.h
  50. +94 −0 lib/inc_linux/snappy-stubs-public.h
  51. +0 −5 lib/include/config.h
  52. BIN lib/org/xerial/snappy/OSInfo.class
  53. BIN lib/silk-weaver.jar
  54. +0 −339 pom.xml
  55. +2 −0 project/build.properties
  56. +5 −0 project/plugins.sbt
  57. +664 −0 sbt
  58. +21 −0 script/dynver.sh
  59. +15 −0 script/travis-deploy.sh
  60. +117 −0 src/checkstyle/checks.xml
  61. +280 −0 src/main/java/org/xerial/snappy/BitShuffle.java
  62. +133 −0 src/main/java/org/xerial/snappy/BitShuffleNative.cpp
  63. +45 −0 src/main/java/org/xerial/snappy/BitShuffleNative.h
  64. +60 −0 src/main/java/org/xerial/snappy/BitShuffleNative.java
  65. +53 −0 src/main/java/org/xerial/snappy/BitShuffleType.java
  66. +167 −26 src/main/java/org/xerial/snappy/OSInfo.java
  67. +624 −0 src/main/java/org/xerial/snappy/PureJavaCrc32C.java
  68. +952 −774 src/main/java/org/xerial/snappy/Snappy.java
  69. +60 −0 src/main/java/org/xerial/snappy/SnappyApi.java
  70. +70 −60 src/main/java/org/xerial/snappy/SnappyBundleActivator.java
  71. +146 −104 src/main/java/org/xerial/snappy/SnappyCodec.java
  72. +65 −62 src/main/java/org/xerial/snappy/SnappyError.java
  73. +69 −60 src/main/java/org/xerial/snappy/SnappyErrorCode.java
  74. +82 −74 src/main/java/org/xerial/snappy/SnappyException.java
  75. +165 −0 src/main/java/org/xerial/snappy/SnappyFramed.java
  76. +685 −0 src/main/java/org/xerial/snappy/SnappyFramedInputStream.java
  77. +570 −0 src/main/java/org/xerial/snappy/SnappyFramedOutputStream.java
  78. +30 −0 src/main/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStream.java
  79. +26 −0 src/main/java/org/xerial/snappy/SnappyIOException.java
  80. +241 −121 src/main/java/org/xerial/snappy/SnappyInputStream.java
  81. +192 −292 src/main/java/org/xerial/snappy/SnappyLoader.java
  82. +299 −237 src/main/java/org/xerial/snappy/SnappyNative.cpp
  83. +32 −0 src/main/java/org/xerial/snappy/SnappyNative.h
  84. +114 −81 src/main/java/org/xerial/snappy/SnappyNative.java
  85. +0 −76 src/main/java/org/xerial/snappy/SnappyNativeAPI.java
  86. +434 −315 src/main/java/org/xerial/snappy/SnappyOutputStream.java
  87. +0 −2 src/main/java/org/xerial/snappy/VERSION
  88. +12 −0 src/main/java/org/xerial/snappy/buffer/BufferAllocator.java
  89. +11 −0 src/main/java/org/xerial/snappy/buffer/BufferAllocatorFactory.java
  90. +80 −0 src/main/java/org/xerial/snappy/buffer/CachedBufferAllocator.java
  91. +32 −0 src/main/java/org/xerial/snappy/buffer/DefaultBufferAllocator.java
  92. +44 −44 src/main/java/org/xerial/snappy/package-info.java
  93. +53 −0 src/main/java/org/xerial/snappy/pool/BufferPool.java
  94. +216 −0 src/main/java/org/xerial/snappy/pool/CachingBufferPool.java
  95. +37 −0 src/main/java/org/xerial/snappy/pool/DefaultPoolFactory.java
  96. +150 −0 src/main/java/org/xerial/snappy/pool/DirectByteBuffers.java
  97. +55 −0 src/main/java/org/xerial/snappy/pool/QuiescentBufferPool.java
  98. BIN src/main/resources/org/xerial/snappy/SnappyNativeLoader.bytecode
  99. +0 −59 src/main/resources/org/xerial/snappy/SnappyNativeLoader.java
  100. +2 −0 src/main/resources/org/xerial/snappy/VERSION
  101. BIN src/main/resources/org/xerial/snappy/native/AIX/ppc/libsnappyjava.a
  102. BIN src/main/resources/org/xerial/snappy/native/AIX/ppc64/libsnappyjava.a
  103. BIN src/main/resources/org/xerial/snappy/native/FreeBSD/x86_64/libsnappyjava.so
  104. BIN src/main/resources/org/xerial/snappy/native/Linux/aarch64/libsnappyjava.so
  105. BIN src/main/resources/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so
  106. BIN src/main/resources/org/xerial/snappy/native/Linux/android-aarch64/libsnappyjava.so
  107. BIN src/main/resources/org/xerial/snappy/native/Linux/android-arm/libsnappyjava.so
  108. BIN src/main/resources/org/xerial/snappy/native/Linux/arm/libsnappyjava.so
  109. BIN src/main/resources/org/xerial/snappy/native/Linux/armhf/libsnappyjava.so
  110. BIN src/main/resources/org/xerial/snappy/native/Linux/armv6/libsnappyjava.so
  111. BIN src/main/resources/org/xerial/snappy/native/Linux/armv7/libsnappyjava.so
  112. BIN src/main/resources/org/xerial/snappy/native/Linux/i386/libsnappyjava.so
  113. BIN src/main/resources/org/xerial/snappy/native/Linux/ppc/libsnappyjava.so
  114. BIN src/main/resources/org/xerial/snappy/native/Linux/ppc64/libsnappyjava.so
  115. BIN src/main/resources/org/xerial/snappy/native/Linux/ppc64le/libsnappyjava.so
  116. BIN src/main/resources/org/xerial/snappy/native/Linux/riscv64/libsnappyjava.so
  117. BIN src/main/resources/org/xerial/snappy/native/Linux/s390x/libsnappyjava.so
  118. BIN src/main/resources/org/xerial/snappy/native/Linux/x86/libsnappyjava.so
  119. BIN src/main/resources/org/xerial/snappy/native/Linux/x86_64/libsnappyjava.so
  120. BIN src/main/resources/org/xerial/snappy/native/Mac/aarch64/libsnappyjava.dylib
  121. BIN src/main/resources/org/xerial/snappy/native/Mac/i386/libsnappyjava.jnilib
  122. BIN src/main/resources/org/xerial/snappy/native/Mac/x86/libsnappyjava.jnilib
  123. BIN src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.dylib
  124. BIN src/main/resources/org/xerial/snappy/native/Mac/x86_64/libsnappyjava.jnilib
  125. BIN src/main/resources/org/xerial/snappy/native/OpenBSD/amd64/libsnappyjava.so
  126. BIN src/main/resources/org/xerial/snappy/native/OpenBSD/i386/libsnappyjava.so
  127. BIN src/main/resources/org/xerial/snappy/native/SunOS/sparc/libsnappyjava.so
  128. BIN src/main/resources/org/xerial/snappy/native/SunOS/x86/libsnappyjava.so
  129. BIN src/main/resources/org/xerial/snappy/native/SunOS/x86_64/libsnappyjava.so
  130. BIN src/main/resources/org/xerial/snappy/native/Windows/amd64/snappyjava.dll
  131. BIN src/main/resources/org/xerial/snappy/native/Windows/x86/snappyjava.dll
  132. BIN src/main/resources/org/xerial/snappy/native/Windows/x86_64/snappyjava.dll
  133. +320 −0 src/test/java/org/xerial/snappy/BitShuffleTest.java
  134. +238 −118 src/test/java/org/xerial/snappy/CalgaryTest.java
  135. +14 −9 src/test/java/org/xerial/snappy/OSInfoTest.java
  136. +73 −0 src/test/java/org/xerial/snappy/RandomGenerator.java
  137. +425 −0 src/test/java/org/xerial/snappy/SnappyFramedStreamTest.java
  138. +150 −0 src/test/java/org/xerial/snappy/SnappyHadoopCompatibleOutputStreamTest.java
  139. +240 −132 src/test/java/org/xerial/snappy/SnappyInputStreamTest.java
  140. +137 −128 src/test/java/org/xerial/snappy/SnappyLoaderTest.java
  141. +379 −188 src/test/java/org/xerial/snappy/SnappyOutputStreamTest.java
  142. +535 −304 src/test/java/org/xerial/snappy/SnappyTest.java
  143. +184 −0 src/test/java/org/xerial/snappy/pool/CachingBufferPoolTest.java
  144. BIN src/test/resources/lib/Linux/libhadoop.so
  145. BIN src/test/resources/lib/Linux/libsnappy.so
  146. BIN src/test/resources/lib/MacOSX/libhadoop.dylib
  147. BIN src/test/resources/lib/MacOSX/libsnappy.dylib
  148. +8 −0 src/test/resources/log4j.properties
  149. 0 src/test/{java → resources}/org/xerial/snappy/alice29.txt
  150. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/bib
  151. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/book1
  152. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/book2
  153. BIN src/test/{java → resources}/org/xerial/snappy/testdata/calgary/geo
  154. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/news
  155. BIN src/test/{java → resources}/org/xerial/snappy/testdata/calgary/obj1
  156. BIN src/test/{java → resources}/org/xerial/snappy/testdata/calgary/obj2
  157. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/paper1
  158. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/paper2
  159. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/paper3
  160. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/paper4
  161. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/paper5
  162. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/paper6
  163. BIN src/test/{java → resources}/org/xerial/snappy/testdata/calgary/pic
  164. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/progc
  165. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/progl
  166. 0 src/test/{java → resources}/org/xerial/snappy/testdata/calgary/progp
  167. BIN src/test/{java → resources}/org/xerial/snappy/testdata/calgary/trans
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.2
2b37d1ce0bbed3d8d03a66292e7d90dcde805624
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sbt text eol=lf

9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Set update schedule for GitHub Actions

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
# Check for updates to GitHub Actions every week
interval: "weekly"
55 changes: 55 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name-template: 'v$RESOLVED_VERSION'
tag-template: 'v$RESOLVED_VERSION'
categories:
- title: '🔥 Breaking Changes'
labels:
- 'breaking'
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'bug'
- title: '👋 Deprecated'
labels:
- 'deprecation'
- title: '🔗 Dependency Updates'
labels:
- 'library-update'
- 'dependencies'
- title: '🛠 Internal Updates'
labels:
- 'internal'
- 'kaizen'
- 'test-library-update'
- 'sbt-plugin-update'
- title: '📚 Docs'
labels:
- 'doc'
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'

template: |
## What's Changed
$CHANGES
**Full Changelog**: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION
autolabeler:
- label: 'doc'
files:
- '*.md'
- label: 'feature'
title:
- '/(support|feature)/i'
- label: 'bug'
title:
- '/fix/i'
- label: 'internal'
title:
- '/internal/i'
- label: 'deprecation'
title:
- '/deprecate/i'
31 changes: 31 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
changelog:
categories:
- title: '🔥 Breaking Changes'
labels:
- 'breaking'
- title: '👋 Deprecated'
labels:
- 'deprecation'
- title: '🚀 Features'
labels:
- 'feature'
- 'enhancement'
- title: '🐛 Bug Fixes'
labels:
- 'bug'
- title: '🔗 Dependency Updates'
labels:
- 'library-update'
- 'dependencies'
- title: '🛠 Internal Updates'
labels:
- 'internal'
- 'kaizen'
- 'test-library-update'
- 'sbt-plugin-update'
- title: '📚 Docs'
labels:
- 'doc'
- title: Other Changes
labels:
- "*"
48 changes: 48 additions & 0 deletions .github/workflows/build-native.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Build Native

on:
workflow_dispatch:
push:
branches:
- master
- main
paths:
- 'src/main/resources/org/xerial/snappy/VERSION'
- 'Makefile'
- 'Makefile.common'
- '**/*.h'
- '**/*.cpp'
- .github/workflows/build-native.yml
pull_request:
paths:
- 'src/main/resources/org/xerial/snappy/VERSION'
- 'Makefile'
- 'Makefile.common'
- '**/*.h'
- '**/*.cpp'

jobs:
build:
permissions:
contents: write
pull-requests: write
name: Build native libraries
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup cmake
uses: jwlawson/actions-setup-cmake@v1.13
with:
cmake-version: '3.16.x'
- name: Build native libraries
run: make clean-native native-all
env:
OCI_EXE: docker
- name: Create Pull Request
if: ${{ github.event_name != 'pull_request' }}
uses: peter-evans/create-pull-request@v5
with:
title: Update native libraries
commit-message: Update native libraries for ${{ github.sha }}
branch: update-native-libs
labels: library-update
27 changes: 27 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Release Drafter

on:
# pull_request event is required only for autolabeler
pull_request:
# Only following types are handled by the action, but one can default to all as well
types: [opened, reopened, synchronize]
# pull_request_target event is required for autolabeler to support PRs from forks
pull_request_target:
types: [opened, reopened, synchronize]

permissions:
contents: read

jobs:
update_PR_labels:
permissions:
contents: read
# write permission is required for autolabeler
# otherwise, read permission is required at least
pull-requests: write
runs-on: ubuntu-latest
steps:
# Runs only pull-request labeler
- uses: release-drafter/release-drafter@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
18 changes: 18 additions & 0 deletions .github/workflows/release-note.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: Release Note

on:
push:
tags:
- v*
workflow_dispatch:

jobs:
release:
name: Create a new release note
runs-on: ubuntu-latest
steps:
- name: Create a release note
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
gh release create "$GITHUB_REF_NAME" --repo="$GITHUB_REPOSITORY" --generate-notes
37 changes: 37 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Release

on:
push:
tags:
- v*
workflow_dispatch:

jobs:
publish_jvm:
name: Publish
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 10000
# Fetch all tags so that sbt-dynver can find the previous release version
- run: git fetch --tags -f
# Install OpenJDK 11
- uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '11'
- name: Setup GPG
env:
PGP_SECRET: ${{ secrets.PGP_SECRET }}
run: echo $PGP_SECRET | base64 --decode | gpg --import --batch --yes
- name: Build bundle
env:
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
run: |
./sbt publishSigned
- name: Release to Sonatype
env:
SONATYPE_USERNAME: '${{ secrets.SONATYPE_USER }}'
SONATYPE_PASSWORD: '${{ secrets.SONATYPE_PASS }}'
run: ./sbt sonatypeBundleRelease
39 changes: 39 additions & 0 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Snapshot Release

on:
push:
branches:
- master
paths:
- '**.scala'
- '**.java'
- '**.sbt'
- 'src/main/resources/org/xerial/snappy/native/**'
- '.github/workflows/snapshot.yml'
tag:
- '!*'
workflow_dispatch:

jobs:
publish_snapshots:
name: Publish snapshots
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 10000
# Fetch all tags so that sbt-dynver can find the previous release version
- run: git fetch --tags
- uses: olafurpg/setup-scala@v14
with:
java-version: adopt@1.11
- uses: actions/cache@v3
with:
path: ~/.cache
key: ${{ runner.os }}-snapshot-${{ hashFiles('**/*.sbt') }}
restore-keys: ${{ runner.os }}-snapshot-
- name: Publish snapshots
env:
SONATYPE_USERNAME: '${{ secrets.SONATYPE_USER }}'
SONATYPE_PASSWORD: '${{ secrets.SONATYPE_PASS }}'
run: ./sbt publish
78 changes: 78 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: CI

on:
pull_request:
paths:
- '**.scala'
- '**.java'
- '**.sbt'
- '.github/workflows/*.yml'
- '**.so'
- '**.dll'
- 'src/main/resources/**'
- 'project/build.properties'
push:
branches:
- master
- main
paths:
- '**.scala'
- '**.java'
- '**.sbt'
- '.github/workflows/*.yml'
- 'src/main/resources/org/xerial/snappy/**'
- 'project/build.properties'

jobs:
code_format:
name: code format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: scalafmt test
run: ./sbt scalafmtCheckAll
test:
name: test jdk11
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: olafurpg/setup-scala@v14
with:
java-version: adopt@1.11
- uses: actions/cache@v3
with:
path: ~/.cache
key: ${{ runner.os }}-jdk11-${{ hashFiles('**/*.sbt') }}
restore-keys: ${{ runner.os }}-jdk11-
- name: Test
run: ./sbt test
test_jdk8:
name: test jdk8
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: olafurpg/setup-scala@v14
with:
java-version: adopt@1.8
- uses: actions/cache@v3
with:
path: ~/.cache
key: ${{ runner.os }}-jdk8-${{ hashFiles('**/*.sbt') }}
restore-keys: ${{ runner.os }}-jdk8-
- name: Test
run: ./sbt test
test_jdk17:
name: test jdk17
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: olafurpg/setup-scala@v14
with:
java-version: 17
- uses: actions/cache@v3
with:
path: ~/.cache
key: ${{ runner.os }}-jdk17-${{ hashFiles('**/*.sbt') }}
restore-keys: ${{ runner.os }}-jdk17-
- name: Test
run: ./sbt test
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -17,7 +17,14 @@ lib_managed/
src_managed/
project/boot/
project/plugins/project/
.bsp

# Scala-IDE specific
.scala_dependencies
atlassian-ide-plugin.xml

src/main/java/**/*.h

.metals
.vscode
.bloop
5 changes: 5 additions & 0 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version = 3.7.14
runner.dialect = scala213source3
maxColumn = 180
style = defaultWithAlign
optIn.breaksInsideChains = true
6 changes: 0 additions & 6 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.jdt.ui.prefs

This file was deleted.

9 changes: 0 additions & 9 deletions .settings/org.maven.ide.eclipse.prefs

This file was deleted.

Loading