greg/helenus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Funnel all paths to the database through one single method implementation (the 'Executioner') so as to ensure all calls into Cassandra are wrapped in a common way (traced, measured, cached, etc.) in a single place.

Browse source
This commit is contained in:
Greg Burd 2017-08-17 12:05:50 -04:00
parent 6ad99fc459
commit 142688a215
6 changed files with 179 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/net/helenus/core/operation/AbstractOperation.java
View file

@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture;
import net.helenus.core.AbstractSessionOperations;
public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>>
extends AbstractStatementOperation<E, O> {
extends AbstractStatementOperation<E, O> implements Transformational<E> {
public abstract E transform(ResultSet resultSet);
@ -41,16 +41,12 @@ public abstract class AbstractOperation<E, O extends AbstractOperation<E, O>>
}
public E sync() {
ResultSet resultSet =
sessionOps.executeAsync(options(buildStatement()), showValues).getUninterruptibly();
E result = transform(resultSet);
if (cacheable()) {
sessionOps.cache(getCacheKey(), result);
}
return result;
return Executioner.INSTANCE.<E>sync(sessionOps, options(buildStatement()),
traceContext, this, showValues);
}
public CompletableFuture<E> async() {
return CompletableFuture.supplyAsync(this::sync);
return Executioner.INSTANCE.<E>async(sessionOps, options(buildStatement()),
traceContext, this, showValues);
}
}

57
src/main/java/net/helenus/core/operation/AbstractOptionalOperation.java
View file

@ -15,19 +15,18 @@
*/
package net.helenus.core.operation;
import brave.Span;
import brave.Tracer;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.ResultSetFuture;
import com.google.common.base.Function;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.Optional;
import net.helenus.core.AbstractSessionOperations;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOperation<E, O>>
extends AbstractStatementOperation<E, O> {
extends AbstractStatementOperation<E, O> implements Transformational<Optional<E>> {
public AbstractOptionalOperation(AbstractSessionOperations sessionOperations) {
super(sessionOperations);
@ -52,51 +51,13 @@ public abstract class AbstractOptionalOperation<E, O extends AbstractOptionalOpe
}
public Optional<E> sync() {
Tracer tracer = this.sessionOps.getZipkinTracer();
final Span cassandraSpan =
(tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
if (cassandraSpan != null) {
cassandraSpan.name("cassandra");
cassandraSpan.start();
}
ResultSet resultSet =
sessionOps.executeAsync(options(buildStatement()), showValues).getUninterruptibly();
Optional<E> result = transform(resultSet);
if (cassandraSpan != null) {
cassandraSpan.finish();
}
return result;
return Executioner.INSTANCE.<Optional<E>>sync(sessionOps, options(buildStatement()),
traceContext, this, showValues);
}
public ListenableFuture<Optional<E>> async() {
final Tracer tracer = this.sessionOps.getZipkinTracer();
final Span cassandraSpan =
(tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
if (cassandraSpan != null) {
cassandraSpan.name("cassandra");
cassandraSpan.start();
}
ResultSetFuture resultSetFuture =
sessionOps.executeAsync(options(buildStatement()), showValues);
ListenableFuture<Optional<E>> future =
Futures.transform(
resultSetFuture,
new Function<ResultSet, Optional<E>>() {
@Override
public Optional<E> apply(ResultSet resultSet) {
Optional<E> result = transform(resultSet);
if (cassandraSpan != null) {
cassandraSpan.finish();
}
return result;
}
},
sessionOps.getExecutor());
return future;
public CompletableFuture<Optional<E>> async() {
return Executioner.INSTANCE.<Optional<E>>async(sessionOps, options(buildStatement()),
traceContext, this, showValues);
}
}

55
src/main/java/net/helenus/core/operation/AbstractStreamOperation.java
View file

@ -15,19 +15,18 @@
*/
package net.helenus.core.operation;
import brave.Span;
import brave.Tracer;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.ResultSetFuture;
import com.google.common.base.Function;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
import net.helenus.core.AbstractSessionOperations;
public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperation<E, O>>
extends AbstractStatementOperation<E, O> {
extends AbstractStatementOperation<E, O> implements Transformational<Stream<E>> {
public AbstractStreamOperation(AbstractSessionOperations sessionOperations) {
super(sessionOperations);
@ -52,50 +51,12 @@ public abstract class AbstractStreamOperation<E, O extends AbstractStreamOperati
}
public Stream<E> sync() {
Tracer tracer = this.sessionOps.getZipkinTracer();
final Span cassandraSpan =
(tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
if (cassandraSpan != null) {
cassandraSpan.name("cassandra");
cassandraSpan.start();
}
ResultSet resultSet =
sessionOps.executeAsync(options(buildStatement()), showValues).getUninterruptibly();
Stream<E> result = transform(resultSet);
if (cassandraSpan != null) {
cassandraSpan.finish();
}
return result;
return Executioner.INSTANCE.<Stream<E>>sync(sessionOps, options(buildStatement()),
traceContext, this, showValues);
}
public ListenableFuture<Stream<E>> async() {
Tracer tracer = this.sessionOps.getZipkinTracer();
final Span cassandraSpan =
(tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
if (cassandraSpan != null) {
cassandraSpan.name("cassandra");
cassandraSpan.start();
}
ResultSetFuture resultSetFuture =
sessionOps.executeAsync(options(buildStatement()), showValues);
ListenableFuture<Stream<E>> future =
Futures.transform(
resultSetFuture,
new Function<ResultSet, Stream<E>>() {
@Override
public Stream<E> apply(ResultSet resultSet) {
Stream<E> result = transform(resultSet);
if (cassandraSpan != null) {
cassandraSpan.finish();
}
return result;
}
},
sessionOps.getExecutor());
return future;
public CompletableFuture<Stream<E>> async() {
return Executioner.INSTANCE.<Stream<E>>async(sessionOps, options(buildStatement()),
traceContext, this, showValues);
}
}

61
src/main/java/net/helenus/core/operation/Executioner.java Normal file
View file

@ -0,0 +1,61 @@
package net.helenus.core.operation;
import brave.Span;
import brave.Tracer;
import brave.propagation.TraceContext;
import com.datastax.driver.core.ResultSet;
import com.datastax.driver.core.ResultSetFuture;
import com.datastax.driver.core.Statement;
import net.helenus.core.AbstractSessionOperations;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
public enum Executioner {
INSTANCE;
<E> E sync(
AbstractSessionOperations session,
Statement statement,
TraceContext traceContext,
Transformational<E> delegate,
boolean showValues) {
try {
return this.<E>async(session, statement, traceContext, delegate, showValues).get();
} catch (InterruptedException | ExecutionException e) {
return null;
}
}
public <E> CompletableFuture<E> async(
AbstractSessionOperations session,
Statement statement,
TraceContext traceContext,
Transformational<E> delegate,
boolean showValues) {
ResultSetFuture futureResultSet = session.executeAsync(statement, showValues);
return CompletableFuture.supplyAsync(
() -> {
Tracer tracer = session.getZipkinTracer();
final Span span =
(tracer != null && traceContext != null) ? tracer.newChild(traceContext) : null;
try {
if (span != null) {
span.name("cassandra");
span.start();
}
ResultSet resultSet = futureResultSet.get(); // TODO: timeout
E result = delegate.transform(resultSet);
return result;
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
} finally {
if (span != null) {
span.finish();
}
}
});
}
}

7
src/main/java/net/helenus/core/operation/Transformational.java Normal file
View file

@ -0,0 +1,7 @@
package net.helenus.core.operation;
import com.datastax.driver.core.ResultSet;
public interface Transformational<E> {
E transform(ResultSet resultSet);
}

173
src/test/java/net/helenus/test/integration/core/tuple/InnerTupleTest.java
View file

@ -15,8 +15,7 @@
*/
package net.helenus.test.integration.core.tuple;
import net.helenus.core.Helenus;
import net.helenus.core.HelenusSession;
import net.helenus.core.Query;
import net.helenus.test.integration.build.AbstractEmbeddedCassandraTest;
@ -24,115 +23,121 @@ import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import net.helenus.core.Helenus;
public class InnerTupleTest extends AbstractEmbeddedCassandraTest {
static PhotoAlbum photoAlbum;
static PhotoAlbum photoAlbum;
static HelenusSession session;
static HelenusSession session;
@BeforeClass
public static void beforeTest() {
session = Helenus.init(getSession()).showCql().add(PhotoAlbum.class).autoCreateDrop().get();
photoAlbum = Helenus.dsl(PhotoAlbum.class, session.getMetadata());
}
@BeforeClass
public static void beforeTest() {
session = Helenus.init(getSession()).showCql().add(PhotoAlbum.class).autoCreateDrop().get();
photoAlbum = Helenus.dsl(PhotoAlbum.class, session.getMetadata());
}
@Test
public void testPrint() {
System.out.println(photoAlbum);
}
@Test
public void testPrint() {
System.out.println(photoAlbum);
}
@Test
public void testCruid() {
@Test
public void testCruid() {
Photo photo =
new Photo() {
Photo photo = new Photo() {
@Override
public byte[] blob() {
return "jpeg".getBytes();
}
};
@Override
public byte[] blob() {
return "jpeg".getBytes();
}
PhotoFolder folder =
new PhotoFolder() {
};
@Override
public String name() {
return "first";
}
PhotoFolder folder = new PhotoFolder() {
@Override
public Photo photo() {
return photo;
}
};
@Override
public String name() {
return "first";
}
// CREATE (C)
@Override
public Photo photo() {
return photo;
}
session.insert().value(photoAlbum::id, 123).value(photoAlbum::folder, folder).sync();
};
// READ (R)
// CREATE (C)
PhotoFolder actual =
session
.select(photoAlbum::folder)
.where(photoAlbum::id, Query.eq(123))
.sync()
.findFirst()
.get()
._1;
session.insert()
.value(photoAlbum::id, 123)
.value(photoAlbum::folder, folder)
.sync();
Assert.assertEquals(folder.name(), actual.name());
// READ (R)
// UPDATE (U)
PhotoFolder actual = session.select(photoAlbum::folder).where(photoAlbum::id, Query.eq(123)).sync().findFirst().get()._1;
// unfortunately this is not working right now in Cassandra, can not update a single column in tuple :(
//session.update()
// .set(photoAlbum.folder().photo()::blob, "Helenus".getBytes())
// .where(photoAlbum::id, eq(123))
// .sync();
Assert.assertEquals(folder.name(), actual.name());
PhotoFolder expected =
new PhotoFolder() {
// UPDATE (U)
@Override
public String name() {
return "seconds";
}
// unfortunately this is not working right now in Cassandra, can not update a single column in tuple :(
//session.update()
// .set(photoAlbum.folder().photo()::blob, "Helenus".getBytes())
// .where(photoAlbum::id, eq(123))
// .sync();
@Override
public Photo photo() {
return photo;
}
};
PhotoFolder expected = new PhotoFolder() {
session.update().set(photoAlbum::folder, expected).where(photoAlbum::id, Query.eq(123)).sync();
@Override
public String name() {
return "seconds";
}
actual =
session
.select(photoAlbum::folder)
.where(photoAlbum::id, Query.eq(123))
.sync()
.findFirst()
.get()
._1;
@Override
public Photo photo() {
return photo;
}
Assert.assertEquals(expected.name(), actual.name());
};
// INSERT (I)
// let's insert null ;)
session.update()
.set(photoAlbum::folder, expected)
.where(photoAlbum::id, Query.eq(123))
.sync();
session.update().set(photoAlbum::folder, null).where(photoAlbum::id, Query.eq(123)).sync();
actual = session.select(photoAlbum::folder).where(photoAlbum::id, Query.eq(123)).sync().findFirst().get()._1;
Assert.assertEquals(expected.name(), actual.name());
// INSERT (I)
// let's insert null ;)
session.update()
.set(photoAlbum::folder, null)
.where(photoAlbum::id, Query.eq(123))
.sync();
actual = session.select(photoAlbum::folder).where(photoAlbum::id, Query.eq(123)).sync().findFirst().get()._1;
Assert.assertNull(actual);
// DELETE (D)
session.delete().where(photoAlbum::id, Query.eq(123)).sync();
long cnt = session.select(photoAlbum::folder).where(photoAlbum::id, Query.eq(123)).sync().count();
Assert.assertEquals(0, cnt);
}
actual =
session
.select(photoAlbum::folder)
.where(photoAlbum::id, Query.eq(123))
.sync()
.findFirst()
.get()
._1;
Assert.assertNull(actual);
// DELETE (D)
session.delete().where(photoAlbum::id, Query.eq(123)).sync();
long cnt =
session.select(photoAlbum::folder).where(photoAlbum::id, Query.eq(123)).sync().count();
Assert.assertEquals(0, cnt);
}
}