yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-12-27 09:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modify BaseDao, add dataset name length check (#806)

Browse Source
This commit is contained in:
Yi (Alan) Wang 2017-10-18 15:01:19 -07:00 committed by GitHub
parent ae6937af41
commit 916e2a940d
3 changed files with 139 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
wherehows-dao/src/main/java/wherehows/dao/table/BaseDao.java
View File

@ -45,11 +45,15 @@ public class BaseDao {
@SneakyThrows
@SuppressWarnings("unchecked")
public <T> T find(@Nonnull Class<T> entityClass, @Nonnull Object primaryKey) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
EntityManager entityManager = null;
try {
return (T) entityManager.find(entityClass, primaryKey);
entityManager = entityManagerFactory.createEntityManager();
return entityManager.find(entityClass, primaryKey);
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -64,16 +68,21 @@ public class BaseDao {
@SneakyThrows
@SuppressWarnings("unchecked")
public <T> T findBy(@Nonnull Class<T> entityClass, @Nonnull String criteriaKey, @Nonnull Object criteriaValue) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<T> criteria = cb.createQuery(entityClass);
Root<T> entityRoot = criteria.from(entityClass);
criteria.select(entityRoot);
criteria.where(cb.equal(entityRoot.get(criteriaKey), criteriaValue));
EntityManager entityManager = null;
try {
entityManager = entityManagerFactory.createEntityManager();
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<T> criteria = cb.createQuery(entityClass);
Root<T> entityRoot = criteria.from(entityClass);
criteria.select(entityRoot);
criteria.where(cb.equal(entityRoot.get(criteriaKey), criteriaValue));
return entityManager.createQuery(criteria).getSingleResult();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -89,16 +98,21 @@ public class BaseDao {
@SuppressWarnings("unchecked")
public <T> List<T> findListBy(@Nonnull Class<T> entityClass, @Nonnull String criteriaKey,
@Nonnull Object criteriaValue) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<T> criteria = cb.createQuery(entityClass);
Root<T> entityRoot = criteria.from(entityClass);
criteria.select(entityRoot);
criteria.where(cb.equal(entityRoot.get(criteriaKey), criteriaValue));
EntityManager entityManager = null;
try {
entityManager = entityManagerFactory.createEntityManager();
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<T> criteria = cb.createQuery(entityClass);
Root<T> entityRoot = criteria.from(entityClass);
criteria.select(entityRoot);
criteria.where(cb.equal(entityRoot.get(criteriaKey), criteriaValue));
return entityManager.createQuery(criteria).getResultList();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -112,23 +126,27 @@ public class BaseDao {
@SneakyThrows
@SuppressWarnings("unchecked")
public <T> List<T> findListBy(@Nonnull Class<T> entityClass, @Nonnull Map<String, ? extends Object> params) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<T> criteria = cb.createQuery(entityClass);
Root<T> entityRoot = criteria.from(entityClass);
//Constructing list of parameters
List<Predicate> predicates = new ArrayList<Predicate>();
for (Map.Entry<String, ? extends Object> entry : params.entrySet()) {
predicates.add(cb.equal(entityRoot.get(entry.getKey()), entry.getValue()));
}
criteria.select(entityRoot);
criteria.where(predicates.toArray(new Predicate[]{}));
EntityManager entityManager = null;
try {
entityManager = entityManagerFactory.createEntityManager();
CriteriaBuilder cb = entityManager.getCriteriaBuilder();
CriteriaQuery<T> criteria = cb.createQuery(entityClass);
Root<T> entityRoot = criteria.from(entityClass);
//Constructing list of parameters
List<Predicate> predicates = new ArrayList<Predicate>();
for (Map.Entry<String, ? extends Object> entry : params.entrySet()) {
predicates.add(cb.equal(entityRoot.get(entry.getKey()), entry.getValue()));
}
criteria.select(entityRoot).where(predicates.toArray(new Predicate[]{}));
return entityManager.createQuery(criteria).getResultList();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -139,14 +157,18 @@ public class BaseDao {
*/
@SneakyThrows
public Object update(@Nonnull Object record) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
entityManager.getTransaction().begin();
EntityManager entityManager = null;
try {
record = entityManager.merge(record);
entityManager = entityManagerFactory.createEntityManager();
entityManager.getTransaction().begin();
Object managedRecord = entityManager.merge(record);
entityManager.getTransaction().commit();
return record;
return managedRecord;
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -156,16 +178,20 @@ public class BaseDao {
*/
@SneakyThrows
public void updateList(@Nonnull List<? extends Object> records) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
entityManager.getTransaction().begin();
EntityManager entityManager = null;
try {
entityManager = entityManagerFactory.createEntityManager();
entityManager.getTransaction().begin();
for (Object record : records) {
entityManager.merge(record);
entityManager.flush();
}
entityManager.getTransaction().commit();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -175,13 +201,17 @@ public class BaseDao {
*/
@SneakyThrows
public void remove(@Nonnull Object record) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
entityManager.getTransaction().begin();
EntityManager entityManager = null;
try {
entityManager = entityManagerFactory.createEntityManager();
entityManager.getTransaction().begin();
entityManager.remove(entityManager.contains(record) ? record : entityManager.merge(record));
entityManager.getTransaction().commit();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -191,16 +221,20 @@ public class BaseDao {
*/
@SneakyThrows
public void removeList(@Nonnull List<? extends Object> records) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
entityManager.getTransaction().begin();
EntityManager entityManager = null;
try {
entityManager = entityManagerFactory.createEntityManager();
entityManager.getTransaction().begin();
for (Object record : records) {
entityManager.remove(entityManager.contains(record) ? record : entityManager.merge(record));
entityManager.flush();
}
entityManager.getTransaction().commit();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -211,8 +245,10 @@ public class BaseDao {
*/
@SneakyThrows
public void executeUpdate(@Nonnull String queryStr, @Nonnull Map<String, Object> params) {
EntityManager entityManager = entityManagerFactory.createEntityManager();
EntityManager entityManager = null;
try {
entityManager = entityManagerFactory.createEntityManager();
Query query = entityManager.createQuery(queryStr);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
@ -220,7 +256,9 @@ public class BaseDao {
query.executeUpdate();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
}

80
wherehows-dao/src/main/java/wherehows/dao/view/BaseViewDao.java
View File

@ -19,8 +19,6 @@ import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.Query;
import lombok.SneakyThrows;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
@ -29,8 +27,6 @@ import org.slf4j.LoggerFactory;
*/
public class BaseViewDao {
private static final Logger log = LoggerFactory.getLogger(BaseViewDao.class);
private final EntityManagerFactory _emFactory;
public BaseViewDao(EntityManagerFactory factory) {
@ -48,16 +44,20 @@ public class BaseViewDao {
@SneakyThrows
@SuppressWarnings("unchecked")
protected <T> List<T> getEntityListBy(String sqlQuery, Class<T> classType, Map<String, Object> params) {
EntityManager entityManager = _emFactory.createEntityManager();
Query query = entityManager.createNativeQuery(sqlQuery, classType);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
}
EntityManager entityManager = null;
try {
entityManager = _emFactory.createEntityManager();
Query query = entityManager.createNativeQuery(sqlQuery, classType);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
}
return (List<T>) query.getResultList();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -72,16 +72,20 @@ public class BaseViewDao {
@SneakyThrows
@SuppressWarnings("unchecked")
protected <T> T getEntityBy(String sqlQuery, Class<T> classType, Map<String, Object> params) {
EntityManager entityManager = _emFactory.createEntityManager();
Query query = entityManager.createNativeQuery(sqlQuery, classType);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
}
EntityManager entityManager = null;
try {
entityManager = _emFactory.createEntityManager();
Query query = entityManager.createNativeQuery(sqlQuery, classType);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
}
return (T) query.getSingleResult();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -94,16 +98,20 @@ public class BaseViewDao {
@SneakyThrows
@SuppressWarnings("unchecked")
protected List<Object[]> getObjectArrayListBy(String sqlQuery, Map<String, Object> params) {
EntityManager entityManager = _emFactory.createEntityManager();
Query query = entityManager.createNativeQuery(sqlQuery);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
}
EntityManager entityManager = null;
try {
return query.getResultList();
entityManager = _emFactory.createEntityManager();
Query query = entityManager.createNativeQuery(sqlQuery);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
}
return (List<Object[]>) query.getResultList();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
@ -116,16 +124,20 @@ public class BaseViewDao {
@SneakyThrows
@SuppressWarnings("unchecked")
protected List<Object> getObjectListBy(String sqlQuery, Map<String, Object> params) {
EntityManager entityManager = _emFactory.createEntityManager();
Query query = entityManager.createNativeQuery(sqlQuery);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
}
EntityManager entityManager = null;
try {
return query.getResultList();
entityManager = _emFactory.createEntityManager();
Query query = entityManager.createNativeQuery(sqlQuery);
for (Map.Entry<String, Object> param : params.entrySet()) {
query.setParameter(param.getKey(), param.getValue());
}
return (List<Object>) query.getResultList();
} finally {
entityManager.close();
if (entityManager != null) {
entityManager.close();
}
}
}
}

8
wherehows-kafka/src/main/java/wherehows/processors/MetadataChangeProcessor.java
View File

@ -42,6 +42,8 @@ public class MetadataChangeProcessor extends KafkaMessageProcessor {
private final DatasetComplianceDao _complianceDao = DAO_FACTORY.getDatasetComplianceDao();
private final int _maxDatasetNameLength = 500;
public MetadataChangeProcessor(DaoFactory daoFactory, KafkaProducer<String, IndexedRecord> producer) {
super(daoFactory, producer);
}
@ -78,6 +80,12 @@ public class MetadataChangeProcessor extends KafkaMessageProcessor {
return;
}
// check dataset name length to be within limit. Otherwise, save to DB will fail.
if (identifier.nativeName.length() > _maxDatasetNameLength) {
log.error("Dataset name too long: " + identifier.nativeName.length(), identifier);
return;
}
// create or update dataset
DictDataset ds =
_dictDatasetDao.insertUpdateDataset(identifier, changeAuditStamp, record.datasetProperty, record.schema,