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

fix: enable werror for ebean dao. #56

Merged
merged 2 commits into from
Dec 3, 2020
Merged

fix: enable werror for ebean dao. #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22e2a55
fix: enable werror for ebean dao.
Nov 3, 2020
9520f1b
remove git conflict markers
Dec 2, 2020
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ apply from: "./gradle/release.gradle"
def wErrorProjects = [
project(':core-models'),
project(':dao-api'),
// project(':dao-impl:ebean-dao'),
project(':dao-impl:ebean-dao'),
// project(':dao-impl:elasticsearch-dao'),
// project(':dao-impl:neo4j-dao'),
project(':restli-resources'),
Expand Down
8 changes: 5 additions & 3 deletions dao-api/src/main/java/com/linkedin/metadata/dao/producer/DummyMetadataEventProducer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.linkedin.common.urn.Urn;
import com.linkedin.data.template.RecordTemplate;
import com.linkedin.data.template.UnionTemplate;
import com.linkedin.metadata.dummy.DummyAspect;
import com.linkedin.metadata.dummy.DummySnapshot;
import javax.annotation.Nonnull;
Expand All @@ -11,11 +12,12 @@
/**
* A dummy metadata event producer that doesn't actually produce any events.
*/
public class DummyMetadataEventProducer<URN extends Urn>
extends BaseMetadataEventProducer<DummySnapshot, DummyAspect, URN> {
public class DummyMetadataEventProducer<SNAPSHOT extends RecordTemplate, ASPECT_UNION extends UnionTemplate, URN extends Urn>
extends BaseMetadataEventProducer<SNAPSHOT, ASPECT_UNION, URN> {

@SuppressWarnings("unchecked")
public DummyMetadataEventProducer() {
super(DummySnapshot.class, DummyAspect.class);
super((Class<SNAPSHOT>) DummySnapshot.class, (Class<ASPECT_UNION>) DummyAspect.class);
}

@Override
Expand Down
23 changes: 0 additions & 23 deletions dao-api/src/test/java/com/linkedin/metadata/dao/producer/DummyMetadataEventProducerTest.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion dao-impl/ebean-dao/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ dependencies {
compile project(':core-models-utils')
compile project(':dao-api')
compile externalDependency.ebean
compile externalDependency.jsonSimple
compile externalDependency.guava

compileOnly externalDependency.ebeanAgent
Expand Down
90 changes: 45 additions & 45 deletions dao-impl/ebean-dao/src/main/java/com/linkedin/metadata/dao/EbeanLocalDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,9 @@ static class GMAIndexPair {
});

@VisibleForTesting
EbeanLocalDAO(@Nonnull Class<ASPECT_UNION> aspectUnionClass, @Nonnull BaseMetadataEventProducer producer,
@Nonnull EbeanServer server, @Nonnull Class<URN> urnClass) {
EbeanLocalDAO(@Nonnull Class<ASPECT_UNION> aspectUnionClass,
@Nonnull BaseMetadataEventProducer<?, ASPECT_UNION, URN> producer, @Nonnull EbeanServer server,
@Nonnull Class<URN> urnClass) {
super(aspectUnionClass, producer);
_server = server;
_urnClass = urnClass;
Expand All @@ -105,13 +106,14 @@ static class GMAIndexPair {
* @param serverConfig {@link ServerConfig} that defines the configuration of EbeanServer instances
* @param urnClass Class of the entity URN
*/
public EbeanLocalDAO(@Nonnull Class<ASPECT_UNION> aspectUnionClass, @Nonnull BaseMetadataEventProducer producer,
@Nonnull ServerConfig serverConfig, @Nonnull Class<URN> urnClass) {
public EbeanLocalDAO(@Nonnull Class<ASPECT_UNION> aspectUnionClass,
@Nonnull BaseMetadataEventProducer<?, ASPECT_UNION, URN> producer, @Nonnull ServerConfig serverConfig,
@Nonnull Class<URN> urnClass) {
this(aspectUnionClass, producer, createServer(serverConfig), urnClass);
}

@VisibleForTesting
EbeanLocalDAO(@Nonnull BaseMetadataEventProducer producer, @Nonnull EbeanServer server,
EbeanLocalDAO(@Nonnull BaseMetadataEventProducer<?, ASPECT_UNION, URN> producer, @Nonnull EbeanServer server,
@Nonnull LocalDAOStorageConfig storageConfig, @Nonnull Class<URN> urnClass,
@Nonnull UrnPathExtractor<URN> urnPathExtractor) {
super(producer, storageConfig);
Expand All @@ -121,7 +123,7 @@ public EbeanLocalDAO(@Nonnull Class<ASPECT_UNION> aspectUnionClass, @Nonnull Bas
}

@VisibleForTesting
EbeanLocalDAO(@Nonnull BaseMetadataEventProducer producer, @Nonnull EbeanServer server,
EbeanLocalDAO(@Nonnull BaseMetadataEventProducer<?, ASPECT_UNION, URN> producer, @Nonnull EbeanServer server,
@Nonnull LocalDAOStorageConfig storageConfig, @Nonnull Class<URN> urnClass) {
this(producer, server, storageConfig, urnClass, new EmptyPathExtractor<>());
}
Expand All @@ -135,8 +137,8 @@ public EbeanLocalDAO(@Nonnull Class<ASPECT_UNION> aspectUnionClass, @Nonnull Bas
* @param urnClass class of the entity URN
* @param urnPathExtractor path extractor to index parts of URNs to the secondary index
*/
public EbeanLocalDAO(@Nonnull BaseMetadataEventProducer producer, @Nonnull ServerConfig serverConfig,
@Nonnull LocalDAOStorageConfig storageConfig, @Nonnull Class<URN> urnClass,
public EbeanLocalDAO(@Nonnull BaseMetadataEventProducer<?, ASPECT_UNION, URN> producer,
@Nonnull ServerConfig serverConfig, @Nonnull LocalDAOStorageConfig storageConfig, @Nonnull Class<URN> urnClass,
@Nonnull UrnPathExtractor<URN> urnPathExtractor) {
this(producer, createServer(serverConfig), storageConfig, urnClass, urnPathExtractor);
}
Expand All @@ -149,8 +151,8 @@ public EbeanLocalDAO(@Nonnull BaseMetadataEventProducer producer, @Nonnull Serve
* @param storageConfig {@link LocalDAOStorageConfig} containing storage config of full list of supported aspects
* @param urnClass class of the entity URN
*/
public EbeanLocalDAO(@Nonnull BaseMetadataEventProducer producer, @Nonnull ServerConfig serverConfig,
@Nonnull LocalDAOStorageConfig storageConfig, @Nonnull Class<URN> urnClass) {
public EbeanLocalDAO(@Nonnull BaseMetadataEventProducer<?, ASPECT_UNION, URN> producer,
@Nonnull ServerConfig serverConfig, @Nonnull LocalDAOStorageConfig storageConfig, @Nonnull Class<URN> urnClass) {
this(producer, createServer(serverConfig), storageConfig, urnClass, new EmptyPathExtractor<>());
}

Expand Down Expand Up @@ -245,7 +247,8 @@ protected <T> T runInTransactionWithRetry(@Nonnull Supplier<T> block, int maxTra

@Override
protected <ASPECT extends RecordTemplate> long saveLatest(@Nonnull URN urn, @Nonnull Class<ASPECT> aspectClass,
@Nullable ASPECT oldValue, @Nullable AuditStamp oldAuditStamp, @Nonnull ASPECT newValue, @Nonnull AuditStamp newAuditStamp) {
@Nullable ASPECT oldValue, @Nullable AuditStamp oldAuditStamp, @Nonnull ASPECT newValue,
@Nonnull AuditStamp newAuditStamp) {
// Save oldValue as the largest version + 1
long largestVersion = 0;
if (oldValue != null && oldAuditStamp != null) {
Expand All @@ -259,8 +262,8 @@ protected <ASPECT extends RecordTemplate> long saveLatest(@Nonnull URN urn, @Non
}

@Override
protected <ASPECT extends RecordTemplate> void updateLocalIndex(@Nonnull URN urn,
@Nonnull ASPECT newValue, long version) {
protected <ASPECT extends RecordTemplate> void updateLocalIndex(@Nonnull URN urn, @Nonnull ASPECT newValue,
long version) {
if (!isLocalSecondaryIndexEnabled()) {
throw new UnsupportedOperationException("Local secondary index isn't supported");
}
Expand Down Expand Up @@ -310,13 +313,10 @@ protected void save(@Nonnull URN urn, @Nonnull RecordTemplate value, @Nonnull Au
}
}

protected long saveSingleRecordToLocalIndex(@Nonnull URN urn, @Nonnull String aspect,
@Nonnull String path, @Nonnull Object value) {
protected long saveSingleRecordToLocalIndex(@Nonnull URN urn, @Nonnull String aspect, @Nonnull String path,
@Nonnull Object value) {

final EbeanMetadataIndex record = new EbeanMetadataIndex()
.setUrn(urn.toString())
.setAspect(aspect)
.setPath(path);
final EbeanMetadataIndex record = new EbeanMetadataIndex().setUrn(urn.toString()).setAspect(aspect).setPath(path);
if (value instanceof Integer || value instanceof Long) {
record.setLongVal(Long.valueOf(value.toString()));
} else if (value instanceof Float || value instanceof Double) {
Expand All @@ -341,15 +341,13 @@ private void updateUrnInLocalIndex(@Nonnull URN urn) {

final Map<String, Object> pathValueMap = _urnPathExtractor.extractPaths(urn);
pathValueMap.forEach(
(path, value) -> saveSingleRecordToLocalIndex(urn, urn.getClass().getCanonicalName(), path, value)
);
(path, value) -> saveSingleRecordToLocalIndex(urn, urn.getClass().getCanonicalName(), path, value));
}

private <ASPECT extends RecordTemplate> void updateAspectInLocalIndex(@Nonnull URN urn, @Nonnull ASPECT newValue) {

if (!_storageConfig.getAspectStorageConfigMap().containsKey(newValue.getClass())
|| _storageConfig.getAspectStorageConfigMap().get(newValue.getClass()) == null
) {
|| _storageConfig.getAspectStorageConfigMap().get(newValue.getClass()) == null) {
return;
}
// step1: remove all rows from the index table corresponding to <urn, aspect> pair
Expand Down Expand Up @@ -453,11 +451,8 @@ protected <ASPECT extends RecordTemplate> void applyTimeBasedRetention(@Nonnull
return result;
}


public boolean existsInLocalIndex(@Nonnull URN urn) {
return _server.find(EbeanMetadataIndex.class)
.where().eq(URN_COLUMN, urn.toString())
.exists();
return _server.find(EbeanMetadataIndex.class).where().eq(URN_COLUMN, urn.toString()).exists();
}

// Will be migrated to use {@link #batchGet(Set<AspectKey<URN, ? extends RecordTemplate>>, int)}
Expand Down Expand Up @@ -498,7 +493,8 @@ public void setQueryKeysCount(int keysCount) {
* @param keysCount the max number of keys for each sub query
*/
@Nonnull
private List<EbeanMetadataAspect> batchGet(@Nonnull Set<AspectKey<URN, ? extends RecordTemplate>> keys, int keysCount) {
private List<EbeanMetadataAspect> batchGet(@Nonnull Set<AspectKey<URN, ? extends RecordTemplate>> keys,
int keysCount) {

int position = 0;
final int totalPageCount = QueryUtils.getTotalPageCount(keys.size(), keysCount);
Expand All @@ -513,7 +509,8 @@ private List<EbeanMetadataAspect> batchGet(@Nonnull Set<AspectKey<URN, ? extends
}

@Nonnull
private List<EbeanMetadataAspect> batchGetHelper(@Nonnull List<AspectKey<URN, ? extends RecordTemplate>> keys, int keysCount, int position) {
private List<EbeanMetadataAspect> batchGetHelper(@Nonnull List<AspectKey<URN, ? extends RecordTemplate>> keys,
int keysCount, int position) {
ExpressionList<EbeanMetadataAspect> query = _server.find(EbeanMetadataAspect.class).select(ALL_COLUMNS).where();

// add or if it is not the last element
Expand Down Expand Up @@ -583,7 +580,8 @@ public <ASPECT extends RecordTemplate> ListResult<URN> listUrns(@Nonnull Class<A
.asc(URN_COLUMN)
.findPagedList();

final List<URN> urns = pagedList.getList().stream().map(entry -> getUrn(entry.getKey().getUrn())).collect(Collectors.toList());
final List<URN> urns =
pagedList.getList().stream().map(entry -> getUrn(entry.getKey().getUrn())).collect(Collectors.toList());
return toListResult(urns, null, pagedList, start);
}

Expand All @@ -607,8 +605,8 @@ public <ASPECT extends RecordTemplate> ListResult<ASPECT> list(@Nonnull Class<AS

final List<ASPECT> aspects =
pagedList.getList().stream().map(a -> toRecordTemplate(aspectClass, a)).collect(Collectors.toList());
final ListResultMetadata listResultMetadata =
makeListResultMetadata(pagedList.getList().stream().map(EbeanLocalDAO::toExtraInfo).collect(Collectors.toList()));
final ListResultMetadata listResultMetadata = makeListResultMetadata(
pagedList.getList().stream().map(EbeanLocalDAO::toExtraInfo).collect(Collectors.toList()));
return toListResult(aspects, listResultMetadata, pagedList, start);
}

Expand All @@ -632,8 +630,8 @@ public <ASPECT extends RecordTemplate> ListResult<ASPECT> list(@Nonnull Class<AS

final List<ASPECT> aspects =
pagedList.getList().stream().map(a -> toRecordTemplate(aspectClass, a)).collect(Collectors.toList());
final ListResultMetadata listResultMetadata =
makeListResultMetadata(pagedList.getList().stream().map(EbeanLocalDAO::toExtraInfo).collect(Collectors.toList()));
final ListResultMetadata listResultMetadata = makeListResultMetadata(
pagedList.getList().stream().map(EbeanLocalDAO::toExtraInfo).collect(Collectors.toList()));
return toListResult(aspects, listResultMetadata, pagedList, start);
}

Expand Down Expand Up @@ -670,7 +668,8 @@ private static <ASPECT extends RecordTemplate> AspectWithExtraInfo<ASPECT> toRec
@Nonnull
private <T> ListResult<T> toListResult(@Nonnull List<T> values, @Nullable ListResultMetadata listResultMetadata,
@Nonnull PagedList<?> pagedList, @Nullable Integer start) {
final int nextStart = (start != null && pagedList.hasNext()) ? start.intValue() + pagedList.getList().size() : ListResult.INVALID_NEXT_START;
final int nextStart = (start != null && pagedList.hasNext()) ? start.intValue() + pagedList.getList().size()
: ListResult.INVALID_NEXT_START;
return ListResult.<T>builder()
// Format
.values(values)
Expand Down Expand Up @@ -744,7 +743,7 @@ static GMAIndexPair getGMAIndexPair(@Nonnull IndexValue indexValue) {
if (indexValue.isBoolean()) {
object = indexValue.getBoolean().toString();
return new GMAIndexPair(EbeanMetadataIndex.STRING_COLUMN, object);
} else if (indexValue.isDouble()) {
} else if (indexValue.isDouble()) {
object = indexValue.getDouble();
return new GMAIndexPair(EbeanMetadataIndex.DOUBLE_COLUMN, object);
} else if (indexValue.isFloat()) {
Expand Down Expand Up @@ -774,8 +773,8 @@ static GMAIndexPair getGMAIndexPair(@Nonnull IndexValue indexValue) {
* @param lastUrn string representation of the urn whose value is used to set the last urn parameter in index query
* @param pageSize maximum number of distinct urns to return which is essentially the LIMIT clause of SQL query
*/
private static void setParameters(@Nonnull IndexCriterionArray indexCriterionArray, @Nonnull Query<EbeanMetadataIndex> indexQuery,
@Nonnull String lastUrn, int pageSize) {
private static void setParameters(@Nonnull IndexCriterionArray indexCriterionArray,
@Nonnull Query<EbeanMetadataIndex> indexQuery, @Nonnull String lastUrn, int pageSize) {
indexQuery.setParameter(1, lastUrn);
int pos = 2;
for (IndexCriterion criterion : indexCriterionArray) {
Expand All @@ -791,7 +790,8 @@ private static void setParameters(@Nonnull IndexCriterionArray indexCriterionArr
@Nonnull
private static String getStringForOperator(@Nonnull Condition condition) {
if (!CONDITION_STRING_MAP.containsKey(condition)) {
throw new UnsupportedOperationException(condition.toString() + " condition is not supported in local secondary index");
throw new UnsupportedOperationException(
condition.toString() + " condition is not supported in local secondary index");
}
return CONDITION_STRING_MAP.get(condition);
}
Expand All @@ -806,8 +806,9 @@ private static String getStringForOperator(@Nonnull Condition condition) {
@Nonnull
private static String constructSQLQuery(@Nonnull IndexCriterionArray indexCriterionArray) {
String selectClause = "SELECT DISTINCT(t0.urn) FROM metadata_index t0";
selectClause += IntStream.range(1, indexCriterionArray.size()).mapToObj(i -> " INNER JOIN metadata_index " + "t"
+ i + " ON t0.urn = " + "t" + i + ".urn").collect(Collectors.joining(""));
selectClause += IntStream.range(1, indexCriterionArray.size())
.mapToObj(i -> " INNER JOIN metadata_index " + "t" + i + " ON t0.urn = " + "t" + i + ".urn")
.collect(Collectors.joining(""));
final StringBuilder whereClause = new StringBuilder("WHERE t0.urn > ?");
IntStream.range(0, indexCriterionArray.size()).forEach(i -> {
final IndexCriterion criterion = indexCriterionArray.get(i);
Expand Down Expand Up @@ -859,7 +860,8 @@ public List<URN> listUrns(@Nonnull IndexFilter indexFilter, @Nullable URN lastUr
throw new UnsupportedOperationException("Empty Index Filter is not supported by EbeanLocalDAO");
}
if (indexCriterionArray.size() > 10) {
throw new UnsupportedOperationException("Currently more than 10 filter conditions is not supported by EbeanLocalDAO");
throw new UnsupportedOperationException(
"Currently more than 10 filter conditions is not supported by EbeanLocalDAO");
}

addEntityTypeFilter(indexFilter);
Expand All @@ -871,8 +873,6 @@ public List<URN> listUrns(@Nonnull IndexFilter indexFilter, @Nullable URN lastUr

final List<EbeanMetadataIndex> pagedList = query.findList();

return pagedList.stream()
.map(entry -> getUrn(entry.getUrn()))
.collect(Collectors.toList());
return pagedList.stream().map(entry -> getUrn(entry.getUrn())).collect(Collectors.toList());
}
}
Loading