You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2015/08/26 01:33:16 UTC
[1/7] incubator-apex-core git commit: updated the version
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3.0 9d03e2536 -> 8fe69fc5a
updated the version
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/5ec8ad0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/5ec8ad0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/5ec8ad0a
Branch: refs/heads/devel-3.0
Commit: 5ec8ad0a5f6426eb7b1c1b4639b08d49a583811e
Parents: 9d03e25
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 3 11:22:31 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 3 11:22:31 2015 -0700
----------------------------------------------------------------------
apex-app-archetype/pom.xml | 2 +-
apex-conf-archetype/pom.xml | 2 +-
api/pom.xml | 2 +-
bufferserver/pom.xml | 4 ++--
common/pom.xml | 2 +-
engine/pom.xml | 2 +-
pom.xml | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5ec8ad0a/apex-app-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/apex-app-archetype/pom.xml b/apex-app-archetype/pom.xml
index 9f97937..db57b5c 100644
--- a/apex-app-archetype/pom.xml
+++ b/apex-app-archetype/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>apex-app-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5ec8ad0a/apex-conf-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/apex-conf-archetype/pom.xml b/apex-conf-archetype/pom.xml
index fff78a9..a1bb9df 100644
--- a/apex-conf-archetype/pom.xml
+++ b/apex-conf-archetype/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>apex-conf-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5ec8ad0a/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 23d1e08..432a541 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>dt-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5ec8ad0a/bufferserver/pom.xml
----------------------------------------------------------------------
diff --git a/bufferserver/pom.xml b/bufferserver/pom.xml
index 78444ff..70bae74 100644
--- a/bufferserver/pom.xml
+++ b/bufferserver/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>dt-bufferserver</artifactId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>com.datatorrent</groupId>
<artifactId>dt-common</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5ec8ad0a/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index ba5009b..6617bfb 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>dt-common</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5ec8ad0a/engine/pom.xml
----------------------------------------------------------------------
diff --git a/engine/pom.xml b/engine/pom.xml
index da43657..5405ad1 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>dt-engine</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/5ec8ad0a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 82971d2..6ee1580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>com.datatorrent</groupId>
<artifactId>dt-framework</artifactId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Realtime Stream Processing Framework</name>
[5/7] incubator-apex-core git commit: APEX-14 #resolve added check to
see if address is null
Posted by th...@apache.org.
APEX-14 #resolve added check to see if address is null
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/ff707101
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ff707101
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ff707101
Branch: refs/heads/devel-3.0
Commit: ff707101f18f59b6d596d24f6c803488de50b462
Parents: 6db66a6
Author: Gaurav <ga...@datatorrent.com>
Authored: Fri Jul 24 13:06:04 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Tue Aug 4 09:21:29 2015 -0700
----------------------------------------------------------------------
.../java/com/datatorrent/stram/engine/StreamingContainer.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ff707101/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
index 35861f1..71364a2 100644
--- a/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
+++ b/engine/src/main/java/com/datatorrent/stram/engine/StreamingContainer.java
@@ -905,7 +905,8 @@ public class StreamingContainer extends YarnContainerMain
bssc.put(StreamContext.EVENT_LOOP, eventloop);
bssc.setBufferServerAddress(InetSocketAddress.createUnresolved(nodi.bufferServerHost, nodi.bufferServerPort));
bssc.put(StreamContext.BUFFER_SERVER_TOKEN, nodi.bufferServerToken);
- if (NetUtils.isLocalAddress(bssc.getBufferServerAddress().getAddress())) {
+ InetAddress inetAddress = bssc.getBufferServerAddress().getAddress();
+ if (inetAddress != null && NetUtils.isLocalAddress(inetAddress)) {
bssc.setBufferServerAddress(new InetSocketAddress(InetAddress.getByName(null), nodi.bufferServerPort));
}
@@ -1096,7 +1097,8 @@ public class StreamingContainer extends YarnContainerMain
StreamContext context = new StreamContext(nidi.declaredStreamId);
context.setBufferServerAddress(InetSocketAddress.createUnresolved(nidi.bufferServerHost, nidi.bufferServerPort));
- if (NetUtils.isLocalAddress(context.getBufferServerAddress().getAddress())) {
+ InetAddress inetAddress = context.getBufferServerAddress().getAddress();
+ if (inetAddress != null && NetUtils.isLocalAddress(inetAddress)) {
context.setBufferServerAddress(new InetSocketAddress(InetAddress.getByName(null), nidi.bufferServerPort));
}
context.put(StreamContext.BUFFER_SERVER_TOKEN, nidi.bufferServerToken);
[2/7] incubator-apex-core git commit: downgrade the maven versions
plugin to address null pointer error -
http://stackoverflow.com/a/29995282/1445892
Posted by th...@apache.org.
downgrade the maven versions plugin to address null pointer error - http://stackoverflow.com/a/29995282/1445892
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/f2043880
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/f2043880
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/f2043880
Branch: refs/heads/devel-3.0
Commit: f2043880aa48a649978dd1c02f23f2eb7f1668d0
Parents: 5ec8ad0
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 3 13:29:40 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 3 13:29:40 2015 -0700
----------------------------------------------------------------------
pom.xml | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/f2043880/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6ee1580..7812c30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,10 @@
<version>2.7</version>
</plugin>
<plugin>
+ <artifactId>maven-versions-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
[3/7] incubator-apex-core git commit: cleaned up the code to rid of
the warnings
Posted by th...@apache.org.
cleaned up the code to rid of the warnings
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/0c65d27e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/0c65d27e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/0c65d27e
Branch: refs/heads/devel-3.0
Commit: 0c65d27e8ddc096454d5c3893058b4e8dfeaa28a
Parents: f204388
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Wed Jul 22 19:43:16 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Tue Aug 4 09:11:23 2015 -0700
----------------------------------------------------------------------
.../com/datatorrent/bufferserver/server/Server.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/0c65d27e/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
----------------------------------------------------------------------
diff --git a/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java b/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
index a8adf08..7c21c6d 100644
--- a/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
+++ b/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
@@ -126,7 +126,7 @@ public class Server implements ServerListener
public void setAuthToken(byte[] authToken)
{
- this.authToken = authToken;
+ this.authToken = authToken == null? null: Arrays.copyOf(authToken, authToken.length);
}
/**
@@ -765,24 +765,24 @@ public class Server implements ServerListener
}
- abstract class SeedDataClient extends AbstractLengthPrependerClient
+ static abstract class SeedDataClient extends AbstractLengthPrependerClient
{
- public SeedDataClient()
+ SeedDataClient()
{
}
- public SeedDataClient(int readBufferSize, int sendBufferSize)
+ SeedDataClient(int readBufferSize, int sendBufferSize)
{
super(readBufferSize, sendBufferSize);
}
- public SeedDataClient(byte[] readbuffer, int position, int sendBufferSize)
+ SeedDataClient(byte[] readbuffer, int position, int sendBufferSize)
{
super(readbuffer, position, sendBufferSize);
}
- public void transferBuffer(byte[] array, int offset, int len)
+ void transferBuffer(byte[] array, int offset, int len)
{
int remainingCapacity;
do {
[6/7] incubator-apex-core git commit: enable semantic versioning
Posted by th...@apache.org.
enable semantic versioning
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/619c9a6d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/619c9a6d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/619c9a6d
Branch: refs/heads/devel-3.0
Commit: 619c9a6d925e67ef97af409abddfaeb9ceeaadd7
Parents: 5ec8ad0
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Fri Aug 7 12:50:59 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Sat Aug 8 12:16:03 2015 -0700
----------------------------------------------------------------------
api/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++
common/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/619c9a6d/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 432a541..a1c1033 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -27,6 +27,46 @@
</repository>
</repositories>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>0.5.1</version>
+ <configuration>
+ <oldVersion>
+ <dependency>
+ <groupId>com.datatorrent</groupId>
+ <artifactId>dt-api</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ </oldVersion>
+ <newVersion>
+ <file>
+ <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+ </file>
+ </newVersion>
+ <parameter>
+ <onlyModified>true</onlyModified>
+ <accessModifier>protected</accessModifier>
+ <breakBuildOnModifications>true</breakBuildOnModifications>
+ <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+ <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
+ <includeSynthetic>false</includeSynthetic>
+ <ignoreMissingClasses>false</ignoreMissingClasses>
+ </parameter>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>cmp</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/619c9a6d/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 6617bfb..6eb7774 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,6 +12,47 @@
<name>Base Library</name>
<packaging>jar</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.github.siom79.japicmp</groupId>
+ <artifactId>japicmp-maven-plugin</artifactId>
+ <version>0.5.1</version>
+ <configuration>
+ <oldVersion>
+ <dependency>
+ <groupId>com.datatorrent</groupId>
+ <artifactId>dt-common</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ </oldVersion>
+ <newVersion>
+ <file>
+ <path>${project.build.directory}/${project.artifactId}-${project.version}.jar</path>
+ </file>
+ </newVersion>
+ <parameter>
+ <onlyModified>true</onlyModified>
+ <accessModifier>protected</accessModifier>
+ <breakBuildOnModifications>true</breakBuildOnModifications>
+ <breakBuildOnBinaryIncompatibleModifications>true</breakBuildOnBinaryIncompatibleModifications>
+ <onlyBinaryIncompatible>false</onlyBinaryIncompatible>
+ <includeSynthetic>false</includeSynthetic>
+ <ignoreMissingClasses>false</ignoreMissingClasses>
+ </parameter>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>cmp</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -47,5 +88,10 @@
<artifactId>validation-api</artifactId>
<version>1.1.0.Final</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
</dependencies>
</project>
[4/7] incubator-apex-core git commit: During request processing,
not processing remaining data in a client by discarding it when
processing is being passed from one client to the next in the chain
Posted by th...@apache.org.
During request processing, not processing remaining data in a client by discarding it when processing is being passed from one client to the next in the chain
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/6db66a6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/6db66a6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/6db66a6c
Branch: refs/heads/devel-3.0
Commit: 6db66a6c2628b36d2caed2a50b8fa47887f72c7f
Parents: 0c65d27
Author: Pramod Immaneni <pr...@datatorrent.com>
Authored: Tue Jul 21 13:19:25 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Tue Aug 4 09:13:08 2015 -0700
----------------------------------------------------------------------
.../datatorrent/bufferserver/server/Server.java | 24 ++++++++------------
1 file changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/6db66a6c/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
----------------------------------------------------------------------
diff --git a/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java b/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
index 7c21c6d..683eb8d 100644
--- a/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
+++ b/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
@@ -352,15 +352,9 @@ public class Server implements ServerListener
class AuthClient extends com.datatorrent.bufferserver.client.AuthClient
{
- boolean ignore;
-
@Override
public void onMessage(byte[] buffer, int offset, int size)
{
- if (ignore) {
- return;
- }
-
authenticateMessage(buffer, offset, size);
unregistered(key);
@@ -374,21 +368,18 @@ public class Server implements ServerListener
client.transferBuffer(buffer, readOffset + size, len);
}
- ignore = true;
+ // Remaining data has been transferred to next client in the chain and is going to be processed there so we would
+ // not be processing it here, hence discarding it
+ discardReadBuffer();
}
}
class UnidentifiedClient extends SeedDataClient
{
- boolean ignore;
@Override
public void onMessage(byte[] buffer, int offset, int size)
{
- if (ignore) {
- return;
- }
-
Tuple request = Tuple.getTuple(buffer, offset, size);
switch (request.getType()) {
case PUBLISHER_REQUEST:
@@ -432,7 +423,10 @@ public class Server implements ServerListener
if (len > 0) {
publisher.transferBuffer(this.buffer, readOffset + size, len);
}
- ignore = true;
+
+ // Remaining data transferred to next client and being processed there, not processed here anymore hence
+ // discarding it
+ discardReadBuffer();
break;
@@ -441,7 +435,9 @@ public class Server implements ServerListener
* unregister the unidentified client since its job is done!
*/
unregistered(key);
- ignore = true;
+ // Control is being transferred to next client in the chain so no more processing in this client after this
+ // message
+ discardReadBuffer();
logger.info("Received subscriber request: {}", request);
SubscribeRequestTuple subscriberRequest = (SubscribeRequestTuple)request;
[7/7] incubator-apex-core git commit: Merge pull request #119 from
243826/semantic-versioning-patch
Posted by th...@apache.org.
Merge pull request #119 from 243826/semantic-versioning-patch
enable semantic versioning
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/8fe69fc5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/8fe69fc5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/8fe69fc5
Branch: refs/heads/devel-3.0
Commit: 8fe69fc5a1152a53902659e1cdab80fff83904b4
Parents: ff70710 619c9a6
Author: Chetan Narsude <ch...@datatorrent.com>
Authored: Mon Aug 10 11:21:40 2015 -0700
Committer: Chetan Narsude <ch...@datatorrent.com>
Committed: Mon Aug 10 11:21:40 2015 -0700
----------------------------------------------------------------------
api/pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++
common/pom.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
----------------------------------------------------------------------