You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by st...@apache.org on 2021/04/06 11:15:54 UTC
[openjpa] branch master updated (f1eee20 -> 3647e4e)
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git.
from f1eee20 update test-oracle profile
new 2d3c6e6 clean up unit test
new 3647e4e OPENJPA-2665 typed Collection
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../openjpa/jdbc/kernel/JDBCStoreManager.java | 2 +-
.../compat/TestNonPrimaryKeyQueryParameters.java | 3 +-
.../slice/jdbc/DistributedJDBCStoreManager.java | 56 +++++++++++-----------
3 files changed, 29 insertions(+), 32 deletions(-)
[openjpa] 01/02: clean up unit test
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 2d3c6e6ee0f5f8f7f73291f33e5580455522070f
Author: Mark Struberg <st...@apache.org>
AuthorDate: Fri Jan 15 13:11:31 2021 +0100
clean up unit test
no need to call em.persist inside the loop on the same entity over again.
---
.../openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java
index f214d19..7c2f77c 100644
--- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java
+++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestNonPrimaryKeyQueryParameters.java
@@ -135,9 +135,8 @@ public class TestNonPrimaryKeyQueryParameters extends SQLListenerTestCase {
LineItem item = new LineItem(String.valueOf(i), 10);
item.setInvoice(invoice);
invoice.getLineItems().add(item);
- em.persist(invoice);
}
- em.flush();
+ em.persist(invoice);
tran.commit();
em.close();
}
[openjpa] 02/02: OPENJPA-2665 typed Collection
Posted by st...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
struberg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openjpa.git
commit 3647e4e2574fc1ea37bb1b0b2e1c535b9818e23f
Author: Mark Struberg <st...@apache.org>
AuthorDate: Tue Apr 6 12:01:11 2021 +0200
OPENJPA-2665 typed Collection
no functional change
---
.../openjpa/jdbc/kernel/JDBCStoreManager.java | 2 +-
.../slice/jdbc/DistributedJDBCStoreManager.java | 56 +++++++++++-----------
2 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
index 0f9e1dd..801bd52 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
@@ -746,7 +746,7 @@ public class JDBCStoreManager implements StoreManager, JDBCStore {
}
@Override
- public Collection flush(Collection sms) {
+ public Collection flush(Collection<OpenJPAStateManager> sms) {
try {
if (_conn != null && _conn.getInnermostDelegate().isReadOnly())
_conn.setReadOnly(false);
diff --git a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java
index a7a062f..b5aee74 100644
--- a/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java
+++ b/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedJDBCStoreManager.java
@@ -246,11 +246,11 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
@Override
public boolean exists(OpenJPAStateManager sm, Object edata) {
- String origin = null;
+ String origin = null;
for (SliceStoreManager slice : _slices) {
if (slice.exists(sm, edata)) {
- origin = slice.getName();
- break;
+ origin = slice.getName();
+ break;
}
}
if (origin != null)
@@ -264,7 +264,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
* slices.
*/
@Override
- public Collection flush(Collection sms) {
+ public Collection flush(Collection<OpenJPAStateManager> sms) {
Collection exceptions = new ArrayList();
List<Future<Collection>> futures = new ArrayList<>();
Map<String, StateManagerSet> subsets = bin(sms, null);
@@ -276,19 +276,17 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
if (subset.isEmpty())
continue;
if (subset.containsReplicated()) {
- Map<OpenJPAStateManager, Object> oldVersions = cacheVersion(
- subset.getReplicated());
+ Map<OpenJPAStateManager, Object> oldVersions = cacheVersion(subset.getReplicated());
collectException(slice.flush(subset), exceptions);
remaining.remove(subset);
rollbackVersion(subset.getReplicated(), oldVersions, remaining);
- }
- else {
+ } else {
futures.add(threadPool.submit(new Flusher(slice, subset)));
}
}
for (Future<Collection> future : futures) {
try {
- collectException(future.get(), exceptions);
+ collectException(future.get(), exceptions);
} catch (InterruptedException e) {
throw new StoreException(e);
} catch (ExecutionException e) {
@@ -296,27 +294,27 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
}
}
- return exceptions;
+ return exceptions;
}
private void collectException(Collection error, Collection holder) {
if (!(error == null || error.isEmpty())) {
- holder.addAll(error);
+ holder.addAll(error);
}
}
@Override
public void commit() {
- for (SliceStoreManager slice : _slices) {
- slice.commit();
- }
+ for (SliceStoreManager slice : _slices) {
+ slice.commit();
+ }
}
@Override
public void rollback() {
- for (SliceStoreManager slice : _slices) {
- slice.rollback();
- }
+ for (SliceStoreManager slice : _slices) {
+ slice.rollback();
+ }
}
/**
@@ -454,16 +452,16 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
*/
@Override
public StoreQuery newQuery(String language) {
- if (QueryLanguages.LANG_SQL.equals(language)) {
- DistributedSQLStoreQuery ret = new DistributedSQLStoreQuery(this);
+ if (QueryLanguages.LANG_SQL.equals(language)) {
+ DistributedSQLStoreQuery ret = new DistributedSQLStoreQuery(this);
for (SliceStoreManager slice : _slices) {
ret.add(slice.newQuery(language));
}
return ret;
- }
+ }
ExpressionParser parser = QueryLanguages.parserForLanguage(language);
if (parser == null) {
- throw new UnsupportedOperationException("Language [" + language + "] not supported");
+ throw new UnsupportedOperationException("Language [" + language + "] not supported");
}
DistributedStoreQuery ret = new DistributedStoreQuery(this, parser);
@@ -500,13 +498,13 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
@Override
public boolean syncVersion(OpenJPAStateManager sm, Object edata) {
- String[] targets = findSliceNames(sm, edata).getSlices();
- boolean sync = true;
- for (String replica : targets) {
- SliceStoreManager slice = lookup(replica);
- sync &= slice.syncVersion(sm, edata);
- }
- return sync;
+ String[] targets = findSliceNames(sm, edata).getSlices();
+ boolean sync = true;
+ for (String replica : targets) {
+ SliceStoreManager slice = lookup(replica);
+ sync &= slice.syncVersion(sm, edata);
+ }
+ return sync;
}
@Override
@@ -558,7 +556,7 @@ class DistributedJDBCStoreManager extends JDBCStoreManager
@Override
public Collection call() throws Exception {
- return store.flush(toFlush);
+ return store.flush(toFlush);
}
}