[geode] branch develop updated: GEODE-5313: User Guide - consolidate transaction coding examples - fix a broken link
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new 065e996 GEODE-5313: User Guide - consolidate transaction coding examples - fix a broken link 065e996 is described below commit 065e996b04f1958f51c6eb6ffd45ef974e62cdcb Author: Dave Barnes AuthorDate: Wed Jun 13 12:00:24 2018 -0700 GEODE-5313: User Guide - consolidate transaction coding examples - fix a broken link --- .../developing/transactions/working_with_transactions.html.md.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geode-docs/developing/transactions/working_with_transactions.html.md.erb b/geode-docs/developing/transactions/working_with_transactions.html.md.erb index e01a158..50a3686 100644 --- a/geode-docs/developing/transactions/working_with_transactions.html.md.erb +++ b/geode-docs/developing/transactions/working_with_transactions.html.md.erb @@ -160,7 +160,7 @@ If the member with the primary copy of the data crashes, the transactional view If a suspended transaction is not touched for a period of time, <%=vars.product_name%> cleans it up automatically. By default, the timeout for a suspended transaction is 30 minutes and can be configured using the system property `gemfire.suspendedtxTimeout`. For example, `gemfire.suspendedtxTimeout=60` specifies a timeout of 60 minutes. -See [Basic Suspend and Resume Transaction Example](transaction_suspend_resume_example.html) for a sample code fragment that suspends and resumes a transaction. +See [Basic Suspend and Resume Transaction Example](transaction_coding_examples.html#suspend_resume_example) for a sample code fragment that suspends and resumes a transaction. ## Using Cache Writer and Cache Listener Plug-Ins -- To stop receiving notification emails like this one, please contact dbar...@apache.org.
[geode] branch develop updated: GEODE-5305: Add flag to TXCommitMessage to indicate the use of shadow key (#2043)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 80aabee GEODE-5305: Add flag to TXCommitMessage to indicate the use
of shadow key (#2043)
80aabee is described below
commit 80aabeede64c81f92437bc1c8be11a4000ed43e2
Author: Jacob Barrett
AuthorDate: Wed Jun 13 10:20:07 2018 -0700
GEODE-5305: Add flag to TXCommitMessage to indicate the use of shadow key
(#2043)
* Add new unit test for TxCommentMessage serialization.
Co-authored-by: Darrel Schneider
---
.../geode/internal/InternalDataSerializer.java | 125 ++-
.../geode/internal/cache/TXCommitMessage.java | 230 ++--
.../apache/geode/internal/cache/TXRegionState.java |4 -
.../geode/internal/cache/TxCommitMessageTest.java | 1167
.../codeAnalysis/sanctionedDataSerializables.txt |8 +-
5 files changed, 1363 insertions(+), 171 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
index 7ab6284..94aea2c 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/InternalDataSerializer.java
@@ -141,23 +141,22 @@ public abstract class InternalDataSerializer extends
DataSerializer {
/**
- * This list contains classes that Geode's classes subclass, such as antlr
AST classes which
- * are used by our Object Query Language. It also contains certain
- * classes that are DataSerializable but end up being serialized as part of
other serializable
- * objects. VersionedObjectList, for instance, is serialized as part of a
- * partial putAll exception object.
+ * This list contains classes that Geode's classes subclass, such as antlr
AST classes which are
+ * used by our Object Query Language. It also contains certain classes that
are DataSerializable
+ * but end up being serialized as part of other serializable objects.
VersionedObjectList, for
+ * instance, is serialized as part of a partial putAll exception object.
*
- * Do not java-serialize objects that Geode does not have complete control
over. This
- * leaves us open to security attacks such as Gadget Chains and compromises
the ability
- * to do a rolling upgrade from one version of Geode to the next.
+ * Do not java-serialize objects that Geode does not have complete control
over. This leaves us
+ * open to security attacks such as Gadget Chains and compromises the
ability to do a rolling
+ * upgrade from one version of Geode to the next.
*
* In general you shouldn't use java serialization and you should implement
- * DataSerializableFixedID
- * for internal Geode objects. This gives you better control over
backward-compatibility.
+ * DataSerializableFixedID for internal Geode objects. This gives you better
control over
+ * backward-compatibility.
*
- * Do not add to this list unless absolutely necessary. Instead put your
classes either
- * in the sanctionedSerializables file for your module or in its
excludedClasses file.
- * Run AnalyzeSerializables to generate the content for the file.
+ * Do not add to this list unless absolutely necessary. Instead put your
classes either in the
+ * sanctionedSerializables file for your module or in its excludedClasses
file. Run
+ * AnalyzeSerializables to generate the content for the file.
*
*/
private static final String SANCTIONED_SERIALIZABLES_DEPENDENCIES_PATTERN =
@@ -798,8 +797,8 @@ public abstract class InternalDataSerializer extends
DataSerializer {
new ConcurrentHashMap<>();
/**
- * {@code RegistrationListener}s that receive callbacks when {@code
DataSerializer}s and
- * {@code Instantiator}s are registered. Note: copy-on-write access used for
this set
+ * {@code RegistrationListener}s that receive callbacks when {@code
DataSerializer}s and {@code
+ * Instantiator}s are registered. Note: copy-on-write access used for this
set
*/
private static volatile Set listeners = new HashSet();
@@ -825,7 +824,6 @@ public abstract class InternalDataSerializer extends
DataSerializer {
* Instantiates an instance of {@code DataSerializer}
*
* @throws IllegalArgumentException If the class can't be instantiated
- *
* @see DataSerializer#register(Class)
*/
static DataSerializer newInstance(Class c) {
@@ -843,7 +841,8 @@ public abstract class InternalDataSerializer extends
DataSerializer {
StringId s =
LocalizedStrings.DataSerializer_CLASS_0_DOES_NOT_HAVE_A_ZEROARGUMENT_CONSTRUCTOR;
Object[] args = new Object[] {c.getName()};
if (c.getDeclaringClass() != null) {
-s =
[geode] branch develop updated: GEODE-5319: Mark test as integration test. (#2055)
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 834b5ee GEODE-5319: Mark test as integration test. (#2055)
834b5ee is described below
commit 834b5ee9df12118db1297580f1013ef1dd9e2f6f
Author: Jacob Barrett
AuthorDate: Wed Jun 13 10:18:31 2018 -0700
GEODE-5319: Mark test as integration test. (#2055)
---
.../org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
index ff8a170..bc9d942 100644
---
a/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
+++
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/LocatorSSLJUnitTest.java
@@ -32,10 +32,10 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.distributed.Locator;
import org.apache.geode.internal.net.SSLConfigurationFactory;
import org.apache.geode.test.junit.categories.ClientServerTest;
-import org.apache.geode.test.junit.categories.UnitTest;
+import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-@Category({UnitTest.class, ClientServerTest.class})
+@Category({IntegrationTest.class, ClientServerTest.class})
public class LocatorSSLJUnitTest {
private final String SERVER_KEY_STORE =
TestUtil.getResourcePath(LocatorSSLJUnitTest.class,
"cacheserver.keystore");
--
To stop receiving notification emails like this one, please contact
jbarr...@apache.org.
[geode] branch feature/GEODE-QueryProvider updated (15459d3 -> d92adb7)
This is an automated email from the ASF dual-hosted git repository. zhouxj pushed a change to branch feature/GEODE-QueryProvider in repository https://gitbox.apache.org/repos/asf/geode.git. discard 15459d3 GEODE-QueryProvider: add pointsConfigMap to support numeric query add b731658 GEODE-5252: Race in management adapter could fail to create MXBeans. (#1993) add 0d89728 Revert "GEODE-5269 CommitConflictException after TransactionInDoubtException" add e9a61bb Split monolithic DistributedTest job into two parallel tasks add ddcd514 Merge pull request #2019 from smgoller/GEODE-5282 add 024ed43 GEODE-5278 Unexpected CommitConflictException caused by faulty region synchronization add cad7a1b GEODE-5269 CommitConflictException after TransactionInDoubtException add b488f12 GEODE-5280: Fixes NPE when logging event (#2022) add dbdd788 GEODE-5283: Client transaction fails with TransactionException: GemFireInternalException add c4e7fb8 GEODE-3692 Intermittent test failure: ClientAuthDUnitTest add d4e9725 GEODE-5267: User Guide - un-document deprecated JTA transaction manager add bec37bd GEODE-5267: User Guide - remove redundant JTA subheads from subnav add 3b35239 Bump Bookbinder, nokogiri dependency add ca7ea46 GEODE-5283: Client transaction fails with TransactionException: GemFireInternalException add 2d0dce3 GEODE-577: Reducing the timeout (#2023) add d0ec4e4 GEODE-5270: Shutting down the AckThread (#2017) add f7fb7e3 GEODE-3013: Prevent multiple node found error to be displayed in the log (#2029) add 44643a8 GEODE-5290: Fixes NPE with ResultsCollectionPdxDeserializerWrapper iterator (#2027) add 373f7ad GEODE-5291: More destroys recorded in CachePerfStats than actual in a transaction with expiration (#2028) add c9e7d88 GEODE-5287 Incorporate ACID semantics into transaction intro docs (#2032) add 4e2f2bc Release server affinity immediately after commit add bdfab05 Merge pull request #2015 from apache/feature/GEODE-5277 add ca0f662 Adding 1.8 as a version in Version.java add 69c8710 GEODE-5292: Fix memory leak for off heap regions with overflow add 81b0019 GEODE-5300: Remove mention of a developer by name add a58d8d2 GEODE-5212: Fix gfsh rule to use gfsh.bat on windows (#2036) add 5d9eb94 GEODE-5288: fix execute function on region call and create more tests to improve coverage. (#2024) add 3cef629 GEODE-5276: fix entries stats from going negative (#2033) add 8956291 GEODE-5279: RegionExistsException coming from JMX Manager (#2026) add 94dd9bb GEODE-5294: Fix ConcurrentModificationException ShutdownAllRequest wh… (#2030) add dca0240 GEODE-5298: User Guide - Document Transactions + Functions Limitation add 2d97c22 GEODE-5292: Ignoring flaky ConcurrentRegion... test until we can fix it add fe9f0d9 Check readiness and closed before assertion add 929f804 Merge pull request #2040 from apache/feature/GEODE-5301 add e4f789b GEODE-5302: set totalLiveCount to 0 after successfuly compacted the oplog. (#2041) add 1da8eb9 GEODE-5288: improve ResultModel assertions (#2038) add ba320cb GEODE-5311: User Guide - simplify navigation for "Client Transactions" section add 48539ed GEODE-5288: improve ResultModel assertions. Fix test add 3ed33a1 GEODE-5307 Hang with servers all in waitForPrimaryMember and one server in NO_PRIMARY_HOSTING state add ca1f3bf GEODE-5312: Cleanup transaction if it is removed by the client tx failover (#2047) add 1e69c19 GEODE-5310: Modified to check for initialized RegionAdvisor add 0f75926 GEODE-5313: User Guide - consolidate transaction coding examples add 09f0ba9 GEODE-5308: User Guide - simplify terminology: "cache transactions" can be "transactions". add 40327e7 GEODE-5308: User Guide - simplify terminology: "cache transactions" can be "transactions". add b12abfa GEODE-4822 fix AnalyzeSerializablesJUnitTest's "actualDataSerializables.dat" new d92adb7 GEODE-QueryProvider: add pointsConfigMap to support numeric query This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (15459d3) \ N -- N -- N refs/heads/feature/GEODE-QueryProvider (d92adb7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 revisions listed above as "new" are entirely new to this repository and will be
[geode] 01/01: GEODE-QueryProvider: add pointsConfigMap to support numeric query
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch feature/GEODE-QueryProvider
in repository https://gitbox.apache.org/repos/asf/geode.git
commit d92adb76bb23bcdb0c3f960e30e1c1cde0454838
Author: zhouxh
AuthorDate: Wed Jun 13 10:01:34 2018 -0700
GEODE-QueryProvider: add pointsConfigMap to support numeric query
---
.../lucene/internal/LuceneIndexFactoryImpl.java| 3 +-
.../cache/lucene/internal/StringQueryProvider.java | 20 +
.../serializer/HeterogeneousLuceneSerializer.java | 33 ++
.../serializer/ReflectionLuceneSerializer.java | 4 +++
4 files changed, 59 insertions(+), 1 deletion(-)
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
index 45d4fe1..0332954 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/LuceneIndexFactoryImpl.java
@@ -22,11 +22,12 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.geode.cache.lucene.LuceneIndexFactory;
import org.apache.geode.cache.lucene.LuceneSerializer;
+import
org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
public class LuceneIndexFactoryImpl implements LuceneIndexFactory {
private final LuceneServiceImpl service;
private final Map fields = new LinkedHashMap();
- private LuceneSerializer serializer;
+ private LuceneSerializer serializer = new HeterogeneousLuceneSerializer();
public LuceneIndexFactoryImpl(final LuceneServiceImpl luceneService) {
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
index f0626b5..d0aeb24 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
+++
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/StringQueryProvider.java
@@ -18,16 +18,21 @@ package org.apache.geode.cache.lucene.internal;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.Map;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
import org.apache.lucene.queryparser.flexible.standard.StandardQueryParser;
+import org.apache.lucene.queryparser.flexible.standard.config.PointsConfig;
import org.apache.lucene.search.Query;
import org.apache.geode.DataSerializer;
import org.apache.geode.cache.lucene.LuceneIndex;
import org.apache.geode.cache.lucene.LuceneQueryException;
import org.apache.geode.cache.lucene.LuceneQueryProvider;
+import org.apache.geode.cache.lucene.LuceneSerializer;
+import
org.apache.geode.cache.lucene.internal.repository.serializer.HeterogeneousLuceneSerializer;
import org.apache.geode.internal.DataSerializableFixedID;
import org.apache.geode.internal.Version;
import org.apache.geode.internal.i18n.LocalizedStrings;
@@ -66,6 +71,21 @@ public class StringQueryProvider implements
LuceneQueryProvider, DataSerializabl
if (luceneQuery == null) {
LuceneIndexImpl indexImpl = (LuceneIndexImpl) index;
StandardQueryParser parser = new
StandardQueryParser(indexImpl.getAnalyzer());
+ //
parser.getQueryConfigHandler().set(StandardQueryConfigHandler.ConfigurationKeys.DATE_RESOLUTION,
+ // DateTools.Resolution.MILLISECOND);
+ Map pointsConfigMap = null;
+ LuceneSerializer serializer = index.getLuceneSerializer();
+ if (serializer instanceof HeterogeneousLuceneSerializer) {
+HeterogeneousLuceneSerializer heteroSerializer =
(HeterogeneousLuceneSerializer) serializer;
+pointsConfigMap = heteroSerializer.getPointsConfigMap();
+ }
+ logger.info(serializer + ":" +
Arrays.toString(indexImpl.getFieldNames()) + ":"
+ + parser.getDateResolution());
+ // pointsConfigMap.put("revenue", new
PointsConfig(NumberFormat.getInstance(),
+ // Integer.class));
+ parser.setPointsConfigMap(pointsConfigMap);
+ // TODO: is DateTools.Resolution optional?
+ // parser.setDateResolution(DateTools.Resolution.MILLISECOND);
parser.setAllowLeadingWildcard(true);
try {
luceneQuery = parser.parse(query, defaultField);
diff --git
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
b/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
index 41281d5..160077a 100644
---
a/geode-lucene/src/main/java/org/apache/geode/cache/lucene/internal/repository/serializer/HeterogeneousLuceneSerializer.java
