You are viewing a plain text version of this content. The canonical link for it is here.
Posted to distributedlog-commits@bookkeeper.apache.org by si...@apache.org on 2017/09/12 08:33:33 UTC
[distributedlog] branch release-0.5.0 updated (f8d0151 -> 596fdb6)
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a change to branch release-0.5.0
in repository https://gitbox.apache.org/repos/asf/distributedlog.git.
from f8d0151 [maven-release-plugin] prepare for next development iteration
new 5cccddb ISSUE #185: Thrift version conflicts and use heap bytebuffer for thrift serialization
new 596fdb6 [maven-release-plugin] prepare release v0.5.0-RC2
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
distributedlog-benchmark/pom.xml | 2 +-
distributedlog-build-tools/pom.xml | 4 ++--
distributedlog-common/pom.xml | 2 +-
distributedlog-core-twitter/pom.xml | 8 +++++++-
distributedlog-core/pom.xml | 2 +-
distributedlog-dist/pom.xml | 2 +-
distributedlog-protocol/pom.xml | 2 +-
distributedlog-proxy-client/pom.xml | 2 +-
.../client/DistributedLogClientImpl.java | 21 +++++++++++++++++----
distributedlog-proxy-protocol/pom.xml | 2 +-
distributedlog-proxy-server/pom.xml | 8 +++++++-
.../distributedlog-basic/pom.xml | 8 +++++++-
.../distributedlog-kafka/pom.xml | 2 +-
.../distributedlog-messaging/pom.xml | 8 +++++++-
distributedlog-tutorials/pom.xml | 2 +-
pom.xml | 4 ++--
tests/backward-compat-0.4/pom.xml | 2 +-
tests/backward-compat/pom.xml | 2 +-
tests/jmh-0.4/pom.xml | 2 +-
tests/jmh/pom.xml | 2 +-
tests/pom.xml | 2 +-
21 files changed, 63 insertions(+), 26 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"distributedlog-commits@bookkeeper.apache.org" <di...@bookkeeper.apache.org>'].
[distributedlog] 02/02: [maven-release-plugin] prepare release
v0.5.0-RC2
Posted by si...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch release-0.5.0
in repository https://gitbox.apache.org/repos/asf/distributedlog.git
commit 596fdb617fec68083c87045a337aed4542ffc7c1
Author: Sijie Guo <si...@apache.org>
AuthorDate: Tue Sep 12 01:33:24 2017 -0700
[maven-release-plugin] prepare release v0.5.0-RC2
---
distributedlog-benchmark/pom.xml | 2 +-
distributedlog-build-tools/pom.xml | 4 ++--
distributedlog-common/pom.xml | 2 +-
distributedlog-core-twitter/pom.xml | 2 +-
distributedlog-core/pom.xml | 2 +-
distributedlog-dist/pom.xml | 2 +-
distributedlog-protocol/pom.xml | 2 +-
distributedlog-proxy-client/pom.xml | 2 +-
distributedlog-proxy-protocol/pom.xml | 2 +-
distributedlog-proxy-server/pom.xml | 2 +-
distributedlog-tutorials/distributedlog-basic/pom.xml | 2 +-
distributedlog-tutorials/distributedlog-kafka/pom.xml | 2 +-
distributedlog-tutorials/distributedlog-messaging/pom.xml | 2 +-
distributedlog-tutorials/pom.xml | 2 +-
pom.xml | 4 ++--
tests/backward-compat-0.4/pom.xml | 2 +-
tests/backward-compat/pom.xml | 2 +-
tests/jmh-0.4/pom.xml | 2 +-
tests/jmh/pom.xml | 2 +-
tests/pom.xml | 2 +-
20 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/distributedlog-benchmark/pom.xml b/distributedlog-benchmark/pom.xml
index cf2bf25..a1ae7c3 100644
--- a/distributedlog-benchmark/pom.xml
+++ b/distributedlog-benchmark/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<artifactId>distributedlog-benchmark</artifactId>
<name>Apache DistributedLog :: Benchmark</name>
diff --git a/distributedlog-build-tools/pom.xml b/distributedlog-build-tools/pom.xml
index 1276393..9aa3c8f 100644
--- a/distributedlog-build-tools/pom.xml
+++ b/distributedlog-build-tools/pom.xml
@@ -20,10 +20,10 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>distributedlog-build-tools</artifactId>
<name>Apache DistributedLog :: Build Tools</name>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</project>
diff --git a/distributedlog-common/pom.xml b/distributedlog-common/pom.xml
index a5ea020..be1b472 100644
--- a/distributedlog-common/pom.xml
+++ b/distributedlog-common/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<artifactId>distributedlog-common</artifactId>
<name>Apache DistributedLog :: Common</name>
diff --git a/distributedlog-core-twitter/pom.xml b/distributedlog-core-twitter/pom.xml
index 5043e05..fccb7e1 100644
--- a/distributedlog-core-twitter/pom.xml
+++ b/distributedlog-core-twitter/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<artifactId>distributedlog-core-twitter</artifactId>
<name>Apache DistributedLog :: Core Library (Twitter Future Interface)</name>
diff --git a/distributedlog-core/pom.xml b/distributedlog-core/pom.xml
index 14fa60f..f3466f6 100644
--- a/distributedlog-core/pom.xml
+++ b/distributedlog-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<artifactId>distributedlog-core</artifactId>
<name>Apache DistributedLog :: Core Library</name>
diff --git a/distributedlog-dist/pom.xml b/distributedlog-dist/pom.xml
index 0ea0e48..7277694 100644
--- a/distributedlog-dist/pom.xml
+++ b/distributedlog-dist/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>..</relativePath>
</parent>
diff --git a/distributedlog-protocol/pom.xml b/distributedlog-protocol/pom.xml
index 83dab62..67aa1e7 100644
--- a/distributedlog-protocol/pom.xml
+++ b/distributedlog-protocol/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<artifactId>distributedlog-protocol</artifactId>
<name>Apache DistributedLog :: Protocol</name>
diff --git a/distributedlog-proxy-client/pom.xml b/distributedlog-proxy-client/pom.xml
index 96aad98..ae1cafe 100644
--- a/distributedlog-proxy-client/pom.xml
+++ b/distributedlog-proxy-client/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<artifactId>distributedlog-proxy-client</artifactId>
<name>Apache DistributedLog :: Proxy Client</name>
diff --git a/distributedlog-proxy-protocol/pom.xml b/distributedlog-proxy-protocol/pom.xml
index f2bbe0b..ddb138b 100644
--- a/distributedlog-proxy-protocol/pom.xml
+++ b/distributedlog-proxy-protocol/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<artifactId>distributedlog-proxy-protocol</artifactId>
<name>Apache DistributedLog :: Proxy Protocol</name>
diff --git a/distributedlog-proxy-server/pom.xml b/distributedlog-proxy-server/pom.xml
index 6637e88..354223a 100644
--- a/distributedlog-proxy-server/pom.xml
+++ b/distributedlog-proxy-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<artifactId>distributedlog-proxy-server</artifactId>
<name>Apache DistributedLog :: Proxy Service</name>
diff --git a/distributedlog-tutorials/distributedlog-basic/pom.xml b/distributedlog-tutorials/distributedlog-basic/pom.xml
index 15e5cfd..6f6f769 100644
--- a/distributedlog-tutorials/distributedlog-basic/pom.xml
+++ b/distributedlog-tutorials/distributedlog-basic/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>distributedlog</artifactId>
<groupId>org.apache.distributedlog</groupId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/distributedlog-tutorials/distributedlog-kafka/pom.xml b/distributedlog-tutorials/distributedlog-kafka/pom.xml
index f8dab11..a17afd8 100644
--- a/distributedlog-tutorials/distributedlog-kafka/pom.xml
+++ b/distributedlog-tutorials/distributedlog-kafka/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>distributedlog</artifactId>
<groupId>org.apache.distributedlog</groupId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/distributedlog-tutorials/distributedlog-messaging/pom.xml b/distributedlog-tutorials/distributedlog-messaging/pom.xml
index 14ac7b6..e77b6e9 100644
--- a/distributedlog-tutorials/distributedlog-messaging/pom.xml
+++ b/distributedlog-tutorials/distributedlog-messaging/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>distributedlog</artifactId>
<groupId>org.apache.distributedlog</groupId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.distributedlog</groupId>
diff --git a/distributedlog-tutorials/pom.xml b/distributedlog-tutorials/pom.xml
index 8c9f744..1dd1363 100644
--- a/distributedlog-tutorials/pom.xml
+++ b/distributedlog-tutorials/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>distributedlog-tutorials</artifactId>
diff --git a/pom.xml b/pom.xml
index 0384622..1e9f019 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
<packaging>pom</packaging>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<name>Apache DistributedLog :: Parent</name>
<description>
Apache DistributedLog provides a high performance replicated log service.
@@ -43,7 +43,7 @@
<connection>scm:git:https://github.com/apache/distributedlog.git</connection>
<developerConnection>scm:git:https://github.com/apache/distributedlog.git</developerConnection>
<url>https://github.com/apache/distributedlog</url>
- <tag>release-0.5.0</tag>
+ <tag>v0.5.0-RC2</tag>
</scm>
<issueManagement>
<system>jira</system>
diff --git a/tests/backward-compat-0.4/pom.xml b/tests/backward-compat-0.4/pom.xml
index 18c2d7f..787d7da 100644
--- a/tests/backward-compat-0.4/pom.xml
+++ b/tests/backward-compat-0.4/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>backward-compat-test-0.4</artifactId>
diff --git a/tests/backward-compat/pom.xml b/tests/backward-compat/pom.xml
index 2659a74..d86cdfa 100644
--- a/tests/backward-compat/pom.xml
+++ b/tests/backward-compat/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>backward-compat-test</artifactId>
diff --git a/tests/jmh-0.4/pom.xml b/tests/jmh-0.4/pom.xml
index 98bf3a3..fe76779 100644
--- a/tests/jmh-0.4/pom.xml
+++ b/tests/jmh-0.4/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>jmh-test-0.4</artifactId>
diff --git a/tests/jmh/pom.xml b/tests/jmh/pom.xml
index 8a6315b..a47b7a1 100644
--- a/tests/jmh/pom.xml
+++ b/tests/jmh/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.distributedlog.tests</groupId>
<artifactId>tests-parent</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
<relativePath>..</relativePath>
</parent>
<artifactId>jmh-test</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index f82a397..65ec987 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog</artifactId>
- <version>0.6.0-SNAPSHOT</version>
+ <version>0.5.0</version>
</parent>
<groupId>org.apache.distributedlog.tests</groupId>
<artifactId>tests-parent</artifactId>
--
To stop receiving notification emails like this one, please contact
"distributedlog-commits@bookkeeper.apache.org" <di...@bookkeeper.apache.org>.
[distributedlog] 01/02: ISSUE #185: Thrift version conflicts and
use heap bytebuffer for thrift serialization
Posted by si...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sijie pushed a commit to branch release-0.5.0
in repository https://gitbox.apache.org/repos/asf/distributedlog.git
commit 5cccddbb7885962ad84758c110eda13fc2d62f46
Author: Sijie Guo <si...@apache.org>
AuthorDate: Tue Sep 12 15:16:49 2017 +0800
ISSUE #185: Thrift version conflicts and use heap bytebuffer for thrift serialization
Descriptions of the changes in this PR:
- it seems that shade plugin doesn't work well with sub-modules. even the libthrift-9 was shaded, it is still imported/included in the sub-modules, causing the version conflict. Explicitly exclude the libthrift from distributedlog-core.
- thrift serialization is using heap bytebuffer. so if a bytebuffer is direct, the serialization will fail. add a change to check if bytebuffer is heap, if bytebuffer is not heap, copy the content into a heap buffer. this is not good for performance, but we don't have any other choices because the limitation comes from libthrift.
Author: Sijie Guo <si...@apache.org>
Reviewers: Enrico Olivelli <eo...@gmail.com>, Jia Zhai <None>, Leigh Stewart <None>
This closes #187 from sijie/use_heapbytebuffer, closes #185
---
distributedlog-core-twitter/pom.xml | 6 ++++++
.../client/DistributedLogClientImpl.java | 21 +++++++++++++++++----
distributedlog-proxy-server/pom.xml | 6 ++++++
.../distributedlog-basic/pom.xml | 6 ++++++
.../distributedlog-messaging/pom.xml | 6 ++++++
5 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/distributedlog-core-twitter/pom.xml b/distributedlog-core-twitter/pom.xml
index fb2046b..5043e05 100644
--- a/distributedlog-core-twitter/pom.xml
+++ b/distributedlog-core-twitter/pom.xml
@@ -29,6 +29,12 @@
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog-core</artifactId>
<version>${project.parent.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
diff --git a/distributedlog-proxy-client/src/main/java/org/apache/distributedlog/client/DistributedLogClientImpl.java b/distributedlog-proxy-client/src/main/java/org/apache/distributedlog/client/DistributedLogClientImpl.java
index ce851b5..55b7c34 100644
--- a/distributedlog-proxy-client/src/main/java/org/apache/distributedlog/client/DistributedLogClientImpl.java
+++ b/distributedlog-proxy-client/src/main/java/org/apache/distributedlog/client/DistributedLogClientImpl.java
@@ -397,14 +397,27 @@ public class DistributedLogClientImpl implements DistributedLogClient, MonitorSe
WriteOp(final String name, final ByteBuf dataBuf) {
super(name, clientStats.getOpStats("write"));
- this.dataBuf = dataBuf;
- this.data = dataBuf.nioBuffer();
+ if (dataBuf.hasArray()) {
+ this.dataBuf = dataBuf;
+ this.data = dataBuf.nioBuffer();
+ } else {
+ // thrift only takes heap byte buffer
+ this.dataBuf = Unpooled.copiedBuffer(dataBuf);
+ dataBuf.release();
+ this.data = this.dataBuf.nioBuffer();
+ }
}
WriteOp(final String name, final ByteBuffer data) {
super(name, clientStats.getOpStats("write"));
- this.data = data;
- this.dataBuf = Unpooled.wrappedBuffer(data);
+ if (data.hasArray()) {
+ this.data = data;
+ this.dataBuf = Unpooled.wrappedBuffer(data);
+ } else {
+ // thrift only takes heap byte buffer
+ this.dataBuf = Unpooled.copiedBuffer(data);
+ this.data = this.dataBuf.nioBuffer();
+ }
}
@Override
diff --git a/distributedlog-proxy-server/pom.xml b/distributedlog-proxy-server/pom.xml
index 56625ac..6637e88 100644
--- a/distributedlog-proxy-server/pom.xml
+++ b/distributedlog-proxy-server/pom.xml
@@ -45,6 +45,12 @@
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog-core</artifactId>
<version>${project.parent.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.twitter</groupId>
diff --git a/distributedlog-tutorials/distributedlog-basic/pom.xml b/distributedlog-tutorials/distributedlog-basic/pom.xml
index fb5ac54..15e5cfd 100644
--- a/distributedlog-tutorials/distributedlog-basic/pom.xml
+++ b/distributedlog-tutorials/distributedlog-basic/pom.xml
@@ -36,6 +36,12 @@
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog-core</artifactId>
<version>${project.parent.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.distributedlog</groupId>
diff --git a/distributedlog-tutorials/distributedlog-messaging/pom.xml b/distributedlog-tutorials/distributedlog-messaging/pom.xml
index 15eded4..14ac7b6 100644
--- a/distributedlog-tutorials/distributedlog-messaging/pom.xml
+++ b/distributedlog-tutorials/distributedlog-messaging/pom.xml
@@ -36,6 +36,12 @@
<groupId>org.apache.distributedlog</groupId>
<artifactId>distributedlog-core</artifactId>
<version>${project.parent.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.distributedlog</groupId>
--
To stop receiving notification emails like this one, please contact
"distributedlog-commits@bookkeeper.apache.org" <di...@bookkeeper.apache.org>.