Skip to content

Commit aba95c4

Browse files
committed
Merge branch 'release/1.1.0-M1'
2 parents 2e22612 + 4945e8a commit aba95c4

File tree

21 files changed

+2063
-9
lines changed

21 files changed

+2063
-9
lines changed

Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ Linux-i386_SNAPPY_FLAGS:=
6868
Linux-amd64_CXX := $(CROSS_PREFIX)g++
6969
Linux-amd64_STRIP := $(CROSS_PREFIX)strip
7070
Linux-amd64_CXXFLAGS := -include lib/inc_linux/jni_md.h -I$(JAVA_HOME)/include -O2 -fPIC -fvisibility=hidden -m64
71-
Linux-amd64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
71+
Linux-amd64_LINKFLAGS := -shared -static-libgcc # -static-libstdc++
7272
Linux-amd64_LIBNAME := libsnappyjava.so
7373
Linux-amd64_SNAPPY_FLAGS :=
7474

Makefile.package

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ test:
7777
ssh $(AMD_SERVER) "source .zprofile && cd $(WORK) && $(TEST_CMD)"
7878

7979
release:
80-
mvn deploy -DperformRelease=true
80+
mvn deploy -DperformRelease=true
8181

8282

Milestone.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
* `SnappyIndexer` for parallel compression/decompression
33
* CUI commands (snap/unsnap)
44

5+
## snappy-java-1.1.0-M1 (27 March, 2013)
6+
* Upgrade to snappy-1.1.0
7+
* Add zero-copy compression (rawCompress, rawUncompress) that can be used with LArray <https://github.com/xerial/larray>
8+
* Drop 32-bit Mac support
9+
510
## snappy-java-1.0.5-M2 (27 September 2012)
611
* Upgrade release for snappy-1.0.5
712

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The snappy-java is a Java port of the snappy
66
* Fast compression/decompression tailored to 64-bit CPU architecture.
77
* JNI-based implementation to achieve comparable performance to the native C++ version.
88
* Although snappy-java uses JNI, it can be used safely with multiple class loaders (e.g. Tomcat, etc.).
9-
* Portable across various operating systems; Snappy-java contains native libraries built for Window/Mac/Linux (32/64-bit). At runtime, snappy-java loads one of these libraries according to your machine environment (It looks system properties, `os.name` and `os.arch`).
9+
* Portable across various operating systems; Snappy-java contains native libraries built for Window/Mac/Linux (64-bit). At runtime, snappy-java loads one of these libraries according to your machine environment (It looks system properties, `os.name` and `os.arch`).
1010
* Simple usage. Add the snappy-java-(version).jar file to your classpath. Then call compression/decompression methods in org.xerial.snappy.Snappy.
1111

1212
## Performance
@@ -51,6 +51,8 @@ In addition, high-level methods (`Snappy.compress(String)`, `Snappy.compress(flo
5151
### Stream-based API
5252
Stream-based compressor/decompressor `SnappyOutputStream`/`SnappyInputStream` are also available for reading/writing large data sets.
5353

54+
* [Javadoc API](https://oss.sonatype.org/service/local/repositories/snapshots/archive/org/xerial/snappy/snappy-java/1.0.5-M5-SNAPSHOT/snappy-java-1.0.5-M5-20130319.150524-2-javadoc.jar/!/index.html)
55+
5456
### Setting classpath
5557
If you have snappy-java-(VERSION).jar in the current directory, use `-classpath` option as follows:
5658

0 commit comments

Comments
 (0)