You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2016/06/27 21:20:53 UTC
[03/50] [abbrv] incubator-geode git commit: GEODE-117 - gfsh put
ignores --skip-if-exists flag
GEODE-117 - gfsh put ignores --skip-if-exists flag
Fixed test, which erroneously reported that the --skip-if-exists flag is honored.
Implemented check for flag within the put operation.
This closes #166
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/91f92a49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/91f92a49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/91f92a49
Branch: refs/heads/feature/GEODE-1571
Commit: 91f92a49726be20dd3000738f77b3b383518adc2
Parents: 83c7c66
Author: Kevin J. Duling <kd...@pivotal.io>
Authored: Fri Jun 17 11:07:49 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Tue Jun 21 09:45:20 2016 -0700
----------------------------------------------------------------------
.../cli/functions/DataCommandFunction.java | 9 ++-
.../commands/GemfireDataCommandsDUnitTest.java | 66 +++++++++++++-------
2 files changed, 51 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/91f92a49/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java
index 48cc83a..927aea8 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/functions/DataCommandFunction.java
@@ -609,9 +609,12 @@ public class DataCommandFunction extends FunctionAdapter implements InternalEnt
valueObject = getClassObject(value,valueClass);
}catch(ClassNotFoundException e){
return DataCommandResult.createPutResult(key, null, null, "ClassNotFoundException " + valueClass, false);
- }
-
- Object returnValue = region.put(keyObject,valueObject);
+ }
+ Object returnValue;
+ if (putIfAbsent && region.containsKey(keyObject))
+ returnValue = region.get(keyObject);
+ else
+ returnValue = region.put(keyObject,valueObject);
Object array[] = getJSONForNonPrimitiveObject(returnValue);
DataCommandResult result = DataCommandResult.createPutResult(key, array[1], null, null, true);
if(array[0]!=null)
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/91f92a49/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 553b7a4..68fe0ae 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -16,7 +16,32 @@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
-import com.gemstone.gemfire.cache.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.IgnoredException.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
+import static com.gemstone.gemfire.test.dunit.Wait.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.query.QueryInvalidException;
import com.gemstone.gemfire.cache.query.data.Portfolio;
import com.gemstone.gemfire.cache.query.internal.CompiledValue;
@@ -32,7 +57,11 @@ import com.gemstone.gemfire.management.cli.Result;
import com.gemstone.gemfire.management.internal.cli.CliUtil;
import com.gemstone.gemfire.management.internal.cli.HeadlessGfsh;
import com.gemstone.gemfire.management.internal.cli.domain.DataCommandRequest;
-import com.gemstone.gemfire.management.internal.cli.dto.*;
+import com.gemstone.gemfire.management.internal.cli.dto.Car;
+import com.gemstone.gemfire.management.internal.cli.dto.Key1;
+import com.gemstone.gemfire.management.internal.cli.dto.ObjectWithCharAttr;
+import com.gemstone.gemfire.management.internal.cli.dto.Value1;
+import com.gemstone.gemfire.management.internal.cli.dto.Value2;
import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
import com.gemstone.gemfire.management.internal.cli.json.GfJsonArray;
import com.gemstone.gemfire.management.internal.cli.json.GfJsonException;
@@ -42,22 +71,18 @@ import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.S
import com.gemstone.gemfire.management.internal.cli.result.ResultData;
import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
-import com.gemstone.gemfire.test.dunit.*;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.IgnoredException;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
import com.gemstone.gemfire.test.junit.categories.DistributedTest;
import com.gemstone.gemfire.test.junit.categories.FlakyTest;
+
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.IgnoredException.addIgnoredException;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-
/**
* Dunit class for testing gemfire data commands : get, put, remove, select, rebalance
*/
@@ -815,7 +840,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
final VM vm1 = Host.getHost(0).getVM(1);
final VM vm2 = Host.getHost(0).getVM(2);
-
+ // Seed the region with some keys
SerializableRunnable putKeys = new SerializableRunnable() {
@Override
public void run() {
@@ -833,6 +858,7 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
};
vm1.invoke(putKeys);
+ // Now try to replace all existing keys with new values to test --skip-if-exists. Values should not be replaced if the key is present.
for (int i = 0; i < COUNT; i++) {
String command = "put";
String key = keyPrefix + i;
@@ -844,20 +870,18 @@ public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
validateResult(cmdResult, true);
}
+ // Verify that none of the values were replaced
SerializableRunnable checkPutIfAbsentKeys = new SerializableRunnable() {
@Override
public void run() {
Cache cache = getCache();
Region region = cache.getRegion(DATA_REGION_NAME_PATH);
assertNotNull(region);
- for (int i = COUNT + 1; i < COUNT; i++) {
+ for (int i = 0; i < COUNT; i++) {
String key = keyPrefix + i;
- String notExpectedvalue = valuePrefix + i + i;
- String expectedvalue = valuePrefix + i;
- String value = (String) region.get(key);
- assertNotNull(value);
- assertEquals(value, expectedvalue);
- if (value.equals(notExpectedvalue)) fail("Value is overriden even if put-If-absent was true");
+ String expected = valuePrefix + i;
+ String actual = (String) region.get(key);
+ assertEquals("--skip-if-exists=true failed to preserve value", expected, actual);
}
}
};