You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2017/02/16 03:24:51 UTC
[1/2] beam git commit: Upgrade bytebuddy to 1.6.8 to jump past asm 5.0
Repository: beam
Updated Branches:
refs/heads/master 18f3767e3 -> 2e766ced5
Upgrade bytebuddy to 1.6.8 to jump past asm 5.0
There is a suspected bug in asm 5.0 that is considered the likely root cause of
a bug sbt-assembly [1] that carried over to Gearpump [2]. This commit upgrades
us to depend on asm 5.2 in which those derivative bugs have cleared up.
I have not found a direct reference to what the issue is, precisely, but
the dependency effect of this is extremely small and these are libraries
that are useful to keep current.
[1] https://github.com/sbt/sbt-assembly/issues/205#issuecomment-279964607
[2] https://issues.apache.org/jira/browse/GEARPUMP-236
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/3e4c05c3
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/3e4c05c3
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/3e4c05c3
Branch: refs/heads/master
Commit: 3e4c05c3449064e7f032a48b98551a73d71a5bbb
Parents: 00ea3f7
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Feb 15 14:02:38 2017 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Wed Feb 15 14:15:36 2017 -0800
----------------------------------------------------------------------
pom.xml | 2 +-
.../beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java | 4 ++--
.../sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/3e4c05c3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d53502e..cc6de11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -871,7 +871,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
- <version>1.5.5</version>
+ <version>1.6.8</version>
</dependency>
<!-- Testing -->
http://git-wip-us.apache.org/repos/asf/beam/blob/3e4c05c3/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java
index 46b21d6..8e3a37c 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java
@@ -427,7 +427,7 @@ public class ByteBuddyDoFnInvokerFactory implements DoFnInvokerFactory {
// Push "this" (DoFnInvoker on top of the stack)
MethodVariableAccess.REFERENCE.loadFrom(0),
// Access this.delegate (DoFn on top of the stack)
- FieldAccess.forField(delegateField).getter(),
+ FieldAccess.forField(delegateField).read(),
// Cast it to the more precise type
TypeCasting.to(doFnType),
// Run the beforeDelegation manipulations.
@@ -637,7 +637,7 @@ public class ByteBuddyDoFnInvokerFactory implements DoFnInvokerFactory {
StackManipulation pushDelegate =
new StackManipulation.Compound(
MethodVariableAccess.REFERENCE.loadFrom(0),
- FieldAccess.forField(delegateField).getter());
+ FieldAccess.forField(delegateField).read());
StackManipulation pushExtraContextFactory = MethodVariableAccess.REFERENCE.loadFrom(1);
http://git-wip-us.apache.org/repos/asf/beam/blob/3e4c05c3/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
index 786857a..123808c 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java
@@ -239,7 +239,7 @@ class ByteBuddyOnTimerInvokerFactory implements OnTimerInvokerFactory {
StackManipulation pushDelegate =
new StackManipulation.Compound(
MethodVariableAccess.REFERENCE.loadFrom(0),
- FieldAccess.forField(delegateField).getter());
+ FieldAccess.forField(delegateField).read());
StackManipulation pushExtraContextFactory = MethodVariableAccess.REFERENCE.loadFrom(1);
@@ -295,7 +295,7 @@ class ByteBuddyOnTimerInvokerFactory implements OnTimerInvokerFactory {
.getDeclaredFields()
.filter(ElementMatchers.named(FN_DELEGATE_FIELD_NAME))
.getOnly())
- .putter(),
+ .write(),
// Return void.
MethodReturn.VOID)
.apply(methodVisitor, implementationContext);
[2/2] beam git commit: This closes #2014: Upgrade bytebuddy to 1.6.8
to jump past asm 5.0
Posted by ke...@apache.org.
This closes #2014: Upgrade bytebuddy to 1.6.8 to jump past asm 5.0
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/2e766ced
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/2e766ced
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/2e766ced
Branch: refs/heads/master
Commit: 2e766ced5e1bf3a605e13da208091d170486f9a8
Parents: 18f3767 3e4c05c
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Feb 15 19:12:09 2017 -0800
Committer: Kenneth Knowles <kl...@google.com>
Committed: Wed Feb 15 19:12:09 2017 -0800
----------------------------------------------------------------------
pom.xml | 2 +-
.../beam/sdk/transforms/reflect/ByteBuddyDoFnInvokerFactory.java | 4 ++--
.../sdk/transforms/reflect/ByteBuddyOnTimerInvokerFactory.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/2e766ced/pom.xml
----------------------------------------------------------------------