You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by gg...@apache.org on 2021/09/22 19:15:22 UTC
[asterixdb] branch master updated: [ASTERIXDB-2969][TEST] Fix
duplicate alias bug in array index RQG query-gen
This is an automated email from the ASF dual-hosted git repository.
ggalvizo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new 48cea4f [ASTERIXDB-2969][TEST] Fix duplicate alias bug in array index RQG query-gen
48cea4f is described below
commit 48cea4fd5f941f69790b6e6cfa59b40bda624fda
Author: ggalvizo <gg...@uci.edu>
AuthorDate: Wed Sep 22 10:15:08 2021 -0700
[ASTERIXDB-2969][TEST] Fix duplicate alias bug in array index RQG query-gen
- user model changes: no
- storage format changes: no
- interface changes: no
There was an issue with the query generation portion of the array index
RQG test. This has been fixed by only generating unique endpoint indexed
field names.
Change-Id: I9109210690439fe332b14e7bd79f1b09aa4096bf
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/13343
Reviewed-by: Ian Maxon <im...@uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
---
.../java/org/apache/asterix/test/array/ArrayDataset.java | 3 ++-
.../org/apache/asterix/test/array/ValueSupplierFactory.java | 13 +++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/array/ArrayDataset.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/array/ArrayDataset.java
index d943953..16088b2 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/array/ArrayDataset.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/array/ArrayDataset.java
@@ -38,8 +38,9 @@ public class ArrayDataset {
public static final String[] VALUES_FOR_ADDITIONAL_GROUPS = new String[] { "1", "2", "3", "4", "5" };
public static final String[] VALUES_FOR_ADDITIONAL_FIELDS = new String[] { "1", "2" };
- public static final String[] CONTAINER_OBJECT_NAMES = new String[] { "container_object_1", "container_object_2" };
public static final String[] CONTAINED_OBJECT_NAMES = new String[] { "contained_object_1", "contained_object_2" };
+ public static final String[] CONTAINER_OBJECT_NAMES = new String[] { "container_object_A", "container_object_B",
+ "container_object_C", "container_object_D", "container_object_E" };
private String fromBaseQuery;
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/array/ValueSupplierFactory.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/array/ValueSupplierFactory.java
index efacf78..0d63f12 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/array/ValueSupplierFactory.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/array/ValueSupplierFactory.java
@@ -44,6 +44,7 @@ public class ValueSupplierFactory {
private class BaseArrayIndexValueSupplier extends ArrayIndex.Builder.ValueSupplier {
private final Set<BaseWisconsinTable.Field> consumedFields = new LinkedHashSet<>();
+ private final Set<String> consumedContainedNames = new LinkedHashSet<>();
@Override
public BaseWisconsinTable.Field getAtomicBaseField() {
@@ -78,8 +79,16 @@ public class ValueSupplierFactory {
}
fieldName.add(baseField.fieldName);
if (randomGenerator.nextBoolean()) {
- int index = randomGenerator.nextInt(ArrayDataset.CONTAINED_OBJECT_NAMES.length);
- fieldName.add(ArrayDataset.CONTAINED_OBJECT_NAMES[index]);
+ // Three tries to generate a unique contained name. Otherwise, we default to no contained name.
+ for (int i = 0; i < 3; i++) {
+ int index = randomGenerator.nextInt(ArrayDataset.CONTAINED_OBJECT_NAMES.length);
+ String containedName = ArrayDataset.CONTAINED_OBJECT_NAMES[index];
+ if (!consumedContainedNames.contains(containedName)) {
+ fieldName.add(containedName);
+ consumedContainedNames.add(containedName);
+ break;
+ }
+ }
}
return fieldName;
}