From 521c48542292e2af2ba2effe3cc4c491f57209e3 Mon Sep 17 00:00:00 2001 From: Keerat Date: Thu, 27 Feb 2020 15:25:07 +0000 Subject: [PATCH 1/6] SEARCH-2110 uncommenting the TODO for the getShardInfoWith2OrMoreShards Test --- .../search/functional/searchServices/search/ShardInfoTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index 573af0ae3..3e5d0b95c 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -189,8 +189,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest case "DB_ID": break; case "DB_ID_RANGE": - // TODO: Uncomment the following assert when fixed: https://issues.alfresco.com/jira/browse/SEARCH-2110 - //assertEquals(shardParams.contains("shard.range="), "Unexpected shard params defined for DB_ID_RANGE"); + assertTrue(shardParams.contains("shard.range="), "Unexpected shard params defined for DB_ID_RANGE"); break; case "DATE": assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for DATE"); From 2f52756a54c834b105a6a1372233a8af28b9d57e Mon Sep 17 00:00:00 2001 From: Keerat Date: Thu, 27 Feb 2020 15:45:30 +0000 Subject: [PATCH 2/6] SEARCH-2110 adding shard.regex paramter for property sharding --- .../search/functional/searchServices/search/ShardInfoTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index 3e5d0b95c..7bbf78438 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -197,6 +197,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest break; case "PROPERTY": assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for PROPERTY"); + assertTrue(shardParams.contains("shard.regex="), "Unexpected shard regex defined for PROPERTY"); break; case "EXPLICIT_ID": assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for EXPLICIT_ID"); From 1f62b4f7dfafc3c92ec2b229fbacaf038d6d8c89 Mon Sep 17 00:00:00 2001 From: Keerat Date: Fri, 28 Feb 2020 08:40:56 +0000 Subject: [PATCH 3/6] SEARCH-2110 fixing review comments --- .../searchServices/search/ShardInfoTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index 7bbf78438..0465a74e5 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -189,18 +189,18 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest case "DB_ID": break; case "DB_ID_RANGE": - assertTrue(shardParams.contains("shard.range="), "Unexpected shard params defined for DB_ID_RANGE"); + assertTrue(shardParams.contains("shard.range="), "Shard Parameters Not as expected for the Shard Method: DB_ID_RANGE"); break; case "DATE": - assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for DATE"); - assertTrue(shardParams.contains("shard.grouping="), "Unexpected shard grouping defined for DATE"); + assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: DATE"); + assertTrue(shardParams.contains("shard.date.grouping="), "Shard Parameters Not as expected for the Shard Method: DATE"); break; case "PROPERTY": - assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for PROPERTY"); - assertTrue(shardParams.contains("shard.regex="), "Unexpected shard regex defined for PROPERTY"); + assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: PROPERTY"); + assertTrue(shardParams.contains("shard.regex="), "Shard Parameters Not as expected for the Shard Method: PROPERTY"); break; case "EXPLICIT_ID": - assertTrue(shardParams.contains("shard.key="), "Unexpected shard params defined for EXPLICIT_ID"); + assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: EXPLICIT_ID"); break; default: throw new AssertionError("Not as expected: " + shardParams.toString()); From fb01193a29e2451648681ade848ec0b725f78a24 Mon Sep 17 00:00:00 2001 From: Keerat Date: Fri, 28 Feb 2020 08:50:14 +0000 Subject: [PATCH 4/6] SEARCH-2110 fixing review comments --- .../search/functional/searchServices/search/ShardInfoTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index 0465a74e5..ff2c59e3e 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -203,7 +203,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: EXPLICIT_ID"); break; default: - throw new AssertionError("Not as expected: " + shardParams.toString()); + throw new AssertionError("Shard Parameters Not as expected for the Shard Method: " + model.getShardMethod() + ": " + shardParams.toString()); } } } From d50ff3f31efd77640d1cf8b44be8080486f4a431 Mon Sep 17 00:00:00 2001 From: Keerat Date: Fri, 28 Feb 2020 08:52:51 +0000 Subject: [PATCH 5/6] SEARCH-2110 fixing review comments --- .../search/functional/searchServices/search/ShardInfoTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index ff2c59e3e..ab0935b58 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -203,7 +203,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: EXPLICIT_ID"); break; default: - throw new AssertionError("Shard Parameters Not as expected for the Shard Method: " + model.getShardMethod() + ": " + shardParams.toString()); + throw new AssertionError("Shard Method Not expected: " + model.getShardMethod() + ": " + shardParams.toString()); } } } From c05e6e207f87f8a533ac1d8842c57241228ee86c Mon Sep 17 00:00:00 2001 From: Keerat Date: Fri, 28 Feb 2020 08:56:12 +0000 Subject: [PATCH 6/6] SEARCH-2110 fixing review comments --- .../search/functional/searchServices/search/ShardInfoTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java index ab0935b58..fe8dd1f9c 100644 --- a/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java +++ b/e2e-test/src/test/java/org/alfresco/test/search/functional/searchServices/search/ShardInfoTest.java @@ -203,7 +203,7 @@ public class ShardInfoTest extends AbstractE2EFunctionalTest assertTrue(shardParams.contains("shard.key="), "Shard Parameters Not as expected for the Shard Method: EXPLICIT_ID"); break; default: - throw new AssertionError("Shard Method Not expected: " + model.getShardMethod() + ": " + shardParams.toString()); + throw new AssertionError("Shard Method Not expected: " + model.getShardMethod()); } } }