incubator-geode git commit: Adding gemfire-lucene subdirectory
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-11 5974ffc8e - a92a47912
Adding gemfire-lucene subdirectory
I forgot to add these files in my last checkin, so the LuceneService was
simply gone in the previous revision. These files were moved out of
gemfire-core.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a92a4791
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a92a4791
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a92a4791
Branch: refs/heads/feature/GEODE-11
Commit: a92a4791275756578d75da888db85afb31c3c998
Parents: 5974ffc
Author: Dan Smith upthewatersp...@apache.org
Authored: Wed Aug 12 17:37:10 2015 -0700
Committer: Dan Smith upthewatersp...@apache.org
Committed: Wed Aug 12 17:37:10 2015 -0700
--
gemfire-lucene/build.gradle | 9 ++
.../gemfire/cache/lucene/LuceneIndex.java | 50
.../gemfire/cache/lucene/LuceneQuery.java | 37 ++
.../cache/lucene/LuceneQueryFactory.java| 121 +++
.../cache/lucene/LuceneQueryResults.java| 29 +
.../cache/lucene/LuceneResultStruct.java| 59 +
.../gemfire/cache/lucene/LuceneService.java | 120 ++
.../cache/lucene/internal/LuceneIndexImpl.java | 54 +
.../lucene/internal/LuceneQueryFactoryImpl.java | 88 ++
.../cache/lucene/internal/LuceneQueryImpl.java | 62 ++
.../lucene/internal/LuceneQueryResultsImpl.java | 66 ++
.../lucene/internal/LuceneResultStructImpl.java | 45 +++
.../lucene/internal/LuceneServiceImpl.java | 99 +++
13 files changed, 839 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a92a4791/gemfire-lucene/build.gradle
--
diff --git a/gemfire-lucene/build.gradle b/gemfire-lucene/build.gradle
new file mode 100644
index 000..b360c59
--- /dev/null
+++ b/gemfire-lucene/build.gradle
@@ -0,0 +1,9 @@
+dependencies {
+provided project(':gemfire-core')
+compile 'org.apache.lucene:lucene-analyzers-common:5.0.0'
+compile 'org.apache.lucene:lucene-core:5.0.0'
+compile 'org.apache.lucene:lucene-queries:5.0.0'
+compile 'org.apache.lucene:lucene-queryparser:5.0.0'
+
+testCompile project(path: ':gemfire-junit', configuration: 'testOutput')
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a92a4791/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
--
diff --git
a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
new file mode 100644
index 000..9b08b05
--- /dev/null
+++
b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java
@@ -0,0 +1,50 @@
+/*=
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *
+ */
+
+package com.gemstone.gemfire.cache.lucene;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.lucene.analysis.Analyzer;
+
+
+/**
+ * An lucene index is built over the data stored in a GemFire Region.
+ * p
+ * An index is specified using a index name, field names, region name.
+ * p
+ * The index name and region name together uniquely identifies the lucene
index.
+ * p
+ *
+ * @author Xiaojian Zhou
+ * @since 8.5
+ */
+public interface LuceneIndex {
+
+ /**
+ * @return the index name of this index
+ */
+ public String getName();
+
+ /**
+ * @return the region name for this index
+ */
+ public String getRegionName();
+
+ /**
+ * @return the indexed field names in a Set
+ */
+ public String[] getFieldNames();
+
+ /**
+ * @return the field to analyzer map
+ */
+ public MapString, Analyzer getFieldAnalyzerMap();
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a92a4791/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
--
diff --git
a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java
new file mode 100644
index 000..0579eef
--- /dev/null
+++
incubator-geode git commit: GEODE-196: Remove unneeded system out in RuntimeIterator
Repository: incubator-geode
Updated Branches:
refs/heads/develop 5054a8a00 - 1eccf9171
GEODE-196: Remove unneeded system out in RuntimeIterator
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1eccf917
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1eccf917
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1eccf917
Branch: refs/heads/develop
Commit: 1eccf917198b0d2ce1e3f350fbf7317d322f2eed
Parents: 5054a8a
Author: Jason Huynh jhu...@pivotal.io
Authored: Thu Aug 13 11:13:51 2015 -0700
Committer: Jason Huynh jhu...@pivotal.io
Committed: Thu Aug 13 11:13:51 2015 -0700
--
.../gemstone/gemfire/cache/query/internal/RuntimeIterator.java| 3 ---
1 file changed, 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1eccf917/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java
--
diff --git
a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java
index 5b3944a..6bf0da2 100644
---
a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java
+++
b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/RuntimeIterator.java
@@ -137,9 +137,6 @@ public class RuntimeIterator extends AbstractCompiledValue
{
}
public Object evaluate(ExecutionContext context) {
-if(current == UNINITIALIZED) {
- System.out.println(asif);
-}
Support.Assert(current != UNINITIALIZED,
error to evaluate RuntimeIterator without setting current first);
return this.current;
[2/3] incubator-geode git commit: GEODE-77: Implement Authenticator interface in class GMSAuthenticator with unit tests.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0a70d514/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
--
diff --git
a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index cb4f9c9..76d9d71 100755
---
a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++
b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -1,1178 +1,1178 @@
-package com.gemstone.gemfire.distributed.internal.membership.gms.membership;
-
-import static
com.gemstone.gemfire.distributed.internal.DistributionManager.LOCATOR_DM_TYPE;
-import static
com.gemstone.gemfire.internal.DataSerializableFixedID.INSTALL_VIEW_MESSAGE;
-import static
com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_REQUEST;
-import static
com.gemstone.gemfire.internal.DataSerializableFixedID.JOIN_RESPONSE;
-import static
com.gemstone.gemfire.internal.DataSerializableFixedID.LEAVE_REQUEST_MESSAGE;
-import static
com.gemstone.gemfire.internal.DataSerializableFixedID.REMOVE_MEMBER_MESSAGE;
-import static
com.gemstone.gemfire.internal.DataSerializableFixedID.VIEW_ACK_MESSAGE;
-
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import org.apache.logging.log4j.Logger;
-
-import com.gemstone.gemfire.SystemConnectException;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
-import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.DistributionMessage;
-import
com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
-import com.gemstone.gemfire.distributed.internal.membership.NetView;
-import com.gemstone.gemfire.distributed.internal.membership.gms.GMSMember;
-import com.gemstone.gemfire.distributed.internal.membership.gms.GMSUtil;
-import com.gemstone.gemfire.distributed.internal.membership.gms.Services;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.JoinLeave;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.interfaces.MessageHandler;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorRequest;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.locator.FindCoordinatorResponse;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.messages.InstallViewMessage;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinRequestMessage;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.messages.JoinResponseMessage;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.messages.LeaveRequestMessage;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.messages.RemoveMemberMessage;
-import
com.gemstone.gemfire.distributed.internal.membership.gms.messages.ViewAckMessage;
-import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient;
-import com.gemstone.gemfire.internal.Version;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-import com.gemstone.gemfire.security.AuthenticationFailedException;
-
-/**
- * GMSJoinLeave handles membership communication with other processes in the
- * distributed system. It replaces the JGroups channel membership services
- * that Geode formerly used for this purpose.
- *
- */
-public class GMSJoinLeave implements JoinLeave, MessageHandler {
-
- /** number of times to try joining before giving up */
- private static final int JOIN_ATTEMPTS =
Integer.getInteger(gemfire.join-attempts, 4);
-
- /** amount of time to sleep before trying to join after a failed attempt */
- private static final int JOIN_RETRY_SLEEP =
Integer.getInteger(gemfire.join-retry-sleep, 1000);
-
- /** amount of time to wait for a view to be acked by all members before
performing suspect processing on non-responders */
- private static final int VIEW_INSTALLATION_TIMEOUT =
Integer.getInteger(gemfire.view-ack-timeout, 12500);
-
-
incubator-geode git commit: GEODE-77 fixing the inability to create multiple MembershipManagers ina single JVM
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-77 0a70d5140 - ab68f4e68
GEODE-77 fixing the inability to create multiple MembershipManagers ina single
JVM
The static MemberAttributes.DEFAULT was being used to pull together all
of the bits of a new members identity (InternalDistributedMember) but
this prevented multiple MembershipManagers from being instantiated w/o
ones identity bleeding into anothers. Now the MembershipManager is the
assembling a single InternalDistributedMember instance, putting info
into it as it becomes available. A new unit test ensures that this is
functioning correctly.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/ab68f4e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ab68f4e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ab68f4e6
Branch: refs/heads/feature/GEODE-77
Commit: ab68f4e683ac784b2602adb3d57323d0ace75db0
Parents: 0a70d51
Author: Bruce Schuchardt bschucha...@pivotal.io
Authored: Thu Aug 13 16:26:30 2015 -0700
Committer: Bruce Schuchardt bschucha...@pivotal.io
Committed: Thu Aug 13 16:36:44 2015 -0700
--
.../internal/AdminDistributedSystemImpl.java| 2 +-
.../client/internal/AuthenticateUserOp.java | 2 +
.../internal/DistributionManager.java | 71 +--
.../internal/LonerDistributionManager.java | 14 +-
.../membership/InternalDistributedMember.java | 47 +-
.../internal/membership/MemberAttributes.java | 7 +-
.../internal/membership/gms/GMSMember.java | 6 +-
.../membership/gms/GMSMemberFactory.java| 38 +-
.../internal/membership/gms/GMSUtil.java| 14 -
.../internal/membership/gms/Services.java | 1 +
.../gms/messenger/JGroupsMessenger.java | 46 +-
.../gms/messenger/JGroupsQuorumChecker.java | 5 +
.../gms/mgr/GMSMembershipManager.java | 39 +-
.../admin/remote/RemoteTransportConfig.java | 28 +-
.../internal/i18n/ParentLocalizedStrings.java | 2 +-
.../cache/ClientServerTimeSyncDUnitTest.java| 1 +
.../DistributedAckRegionCCEDUnitTest.java | 4 +-
.../distributed/DistributedSystemDUnitTest.java | 3 +-
.../ConsoleDistributionManagerDUnitTest.java| 2 +-
.../internal/LocalDistributionManagerTest.java | 475 ---
.../membership/MembershipJUnitTest.java | 160 ++-
.../PartitionedRegionLoadModelJUnitTest.java| 6 -
.../DurableClientReconnectDUnitTest.java| 2 +-
23 files changed, 281 insertions(+), 694 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ab68f4e6/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
--
diff --git
a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index 049b121..d0a879a 100755
---
a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++
b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -1735,7 +1735,7 @@ implements
com.gemstone.gemfire.admin.AdminDistributedSystem,
isMcastEnabled(), getDisableTcp(),
getDisableAutoReconnect(),
getBindAddress(), buildSSLConfig(), parseLocators(),
-getMembershipPortRange(), getTcpPort());
+getMembershipPortRange(), getTcpPort(),
DistributionManager.ADMIN_ONLY_DM_TYPE);
return new GfManagerAgentConfig(
getSystemName(), conf, logWriter, this.alertLevel.getSeverity(), this,
this);
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ab68f4e6/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
--
diff --git
a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
index e3c7fa3..dc64e6c 100644
---
a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
+++
b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/internal/AuthenticateUserOp.java
@@ -99,6 +99,7 @@ public class AuthenticateUserOp {
public AuthenticateUserOpImpl(Connection con, ExecutablePool pool) {
super(MessageType.USER_CREDENTIAL_MESSAGE, 1);
byte[] credentialBytes = null;
+ // TODO this is not a valid way to create a member ID
DistributedMember server = new InternalDistributedMember(con.getSocket()
