Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade es #10

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade es #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2ec2fa
initial version to upgrade to 1.1.x es
Jun 17, 2014
e988307
fix unit tests
Jun 18, 2014
e457f82
upgrade version
Jun 18, 2014
8c2b288
modified to fit the ES changes
Dec 31, 2014
5a14c01
1.4.2 seems to be unstable, 1.4.1 works
Dec 31, 2014
d93ba7c
Merge pull request #3 from rkophs/ESv1.4.2_Update
vrecan Jan 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
<groupId>org.elasticsearch.plugin</groupId>
<artifactId>transport-zeromq</artifactId>
<packaging>jar</packaging>
<version>0.0.4-SNAPSHOT</version>
<version>0.0.6-SNAPSHOT</version>
<name>ØMQ transport layer plugin for Elasticsearch</name>
<url>https://github.com/tlrx/transport-zeromq</url>
<url>https://github.com/itiu/transport-zeromq</url>

<properties>
<elasticsearch.version>0.19.2</elasticsearch.version>
<elasticsearch.version>1.4.1</elasticsearch.version>
</properties>

<scm>
<url>scm:git:git@github.com:tlrx/transport-zeromq.git</url>
<connection>scm:git:git@github.com:tlrx/transport-zeromq.git</connection>
<developerConnection>scm:git:git@github.com:tlrx/transport-zeromq.git</developerConnection>
</scm>

<issueManagement>
<system>GitHub</system>
<url>https://github.com/tlrx/transport-zeromq/issues/</url>
Expand All @@ -43,14 +43,23 @@
<dependency>
<groupId>org.elasticsearch.zeromq</groupId>
<artifactId>jzmq</artifactId>
<version>1.0.0</version>
<version>2.2.2-SNAPSHOT</version>
<scope>system</scope>
<systemPath>${project.basedir}/jzmq-1.0.0.jar</systemPath>
<systemPath>/usr/local/probe/share/java/zmq.jar</systemPath>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.10</version>
<configuration>
<forkMode>once</forkMode>
<argLine>-Djava.library.path=/usr/local/probe/lib:/usr/local/probe/share/java</argLine>
</configuration>
</plugin>
<plugin>
<groupId>com.github.github</groupId>
<artifactId>downloads-maven-plugin</artifactId>
Expand Down Expand Up @@ -133,8 +142,9 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.7</source>
<target>1.7</target>
<argLine>-Djava.library.path=/usr/local/probe/lib:/usr/local/probe/share/java</argLine>
</configuration>
</plugin>
</plugins>
Expand All @@ -148,7 +158,7 @@
</resource>
</resources>
</build>

<repositories>
<repository>
<id>sonatype</id>
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/elasticsearch/zeromq/ZMQRestImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ public ZMQRestResponse process(ZMQRestRequest request){
final CountDownLatch latch = new CountDownLatch(1);
final AtomicReference<ZMQRestResponse> ref = new AtomicReference<ZMQRestResponse>();

this.restController.dispatchRequest(request, new RestChannel() {
this.restController.dispatchRequest(request, new RestChannel(request) {

@Override
public void sendResponse(RestResponse response) {
try {
if(logger.isTraceEnabled()){
logger.info("Response to ØMQ client: {}", new String(response.content()));
logger.info("Response to ØMQ client: {}", new String(response.content().toBytes()));
}
ref.set(convert(response));
} catch (IOException e) {
Expand All @@ -80,13 +80,13 @@ private ZMQRestResponse convert(RestResponse response) throws IOException {
if(response.contentType() != null){
zmqResponse.setContentType(response.contentType());
}
if (response.contentLength() > 0) {
if (response.content().length() > 0) {
if (response.contentThreadSafe()) {
zmqResponse.setBody(ByteBuffer.wrap(response.content(), 0, response.contentLength()));
zmqResponse.setBody(ByteBuffer.wrap(response.content().toBytes(), 0, response.content().length()));
} else {
// argh!, we need to copy it over since we are not on the same thread...
byte[] body = new byte[response.contentLength()];
System.arraycopy(response.content(), 0, body, 0, response.contentLength());
byte[] body = new byte[response.content().length()];
System.arraycopy(response.content(), 0, body, 0, response.content().length());
zmqResponse.setBody(ByteBuffer.wrap(body));
}
}
Expand Down
Loading