This is an automated email from the ASF dual-hosted git repository.
alsuliman 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 57aefaa657 [ASTERIXDB-3511][COMP] Set 'ordered field' to true as
default configuration
57aefaa657 is described below
commit 57aefaa657e78eed014aa2aa5b192490601dd4ca
Author: AnkitPrabhu <[email protected]>
AuthorDate: Tue Oct 15 10:12:16 2024 +0530
[ASTERIXDB-3511][COMP] Set 'ordered field' to true as default configuration
- user model changes: no
- storage format changes: no
- interface changes: no
Ext-ref: MB-61971, MB-64515
Change-Id: I03b39e3205200c0fdb21ead864878e720718a6c1
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18964
Integration-Tests: Jenkins <[email protected]>
Reviewed-by: Ali Alsuliman <[email protected]>
Tested-by: Ali Alsuliman <[email protected]>
---
.../apache/asterix/compiler/provider/SqlppCompilationProvider.java | 2 +-
.../src/main/java/org/apache/asterix/api/common/APIFramework.java | 4 ++--
asterixdb/asterix-app/src/main/resources/cc.conf | 1 +
asterixdb/asterix-app/src/main/resources/cc2.conf | 1 +
asterixdb/asterix-app/src/main/resources/cc3.conf | 1 +
asterixdb/asterix-app/src/main/resources/cc4.conf | 1 +
asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf | 1 +
.../asterix-app/src/main/resources/cc_static_partitioning.conf | 1 +
.../apache/asterix/api/common/AsterixHyracksIntegrationUtil.java | 3 ++-
.../org/apache/asterix/api/common/CloudStorageIntegrationUtil.java | 2 +-
.../src/test/java/org/apache/asterix/test/common/TestExecutor.java | 2 +-
asterixdb/asterix-app/src/test/resources/cc-analyze.conf | 3 ++-
asterixdb/asterix-app/src/test/resources/cc-cbotest.conf | 1 +
.../asterix-app/src/test/resources/cc-cloud-storage-azblob.conf | 1 +
asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf | 1 +
.../resources/{cc-cloud-storage.conf => cc-cloud-storage-main.conf} | 2 +-
asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf | 1 +
asterixdb/asterix-app/src/test/resources/cc-columnar.conf | 1 +
asterixdb/asterix-app/src/test/resources/{cc.conf => cc-main.conf} | 2 +-
asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf | 1 +
asterixdb/asterix-app/src/test/resources/cc-single-partition.conf | 1 +
asterixdb/asterix-app/src/test/resources/cc-single.conf | 1 +
.../asterix-app/src/test/resources/cc-small-txn-log-partition.conf | 1 +
asterixdb/asterix-app/src/test/resources/cc-ssl.conf | 1 +
asterixdb/asterix-app/src/test/resources/cc-storage.conf | 1 +
asterixdb/asterix-app/src/test/resources/cc.conf | 1 +
.../results/api/cluster_state_1/cluster_state_1.1.regexadm | 2 +-
.../api/cluster_state_1_full/cluster_state_1_full.1.regexadm | 2 +-
.../api/cluster_state_1_less/cluster_state_1_less.1.regexadm | 2 +-
.../java/org/apache/asterix/common/config/CompilerProperties.java | 6 +++---
.../java/org/apache/asterix/common/config/OptimizationConfUtil.java | 2 +-
.../om/typecomputer/impl/OpenRecordConstructorResultType.java | 4 ++--
.../asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf | 3 ++-
asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf | 1 +
asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf | 1 +
.../org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java | 2 +-
.../algebricks/core/rewriter/base/PhysicalOptimizationConfig.java | 2 +-
37 files changed, 44 insertions(+), 21 deletions(-)
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/SqlppCompilationProvider.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/SqlppCompilationProvider.java
index eef5884031..10574b1cb2 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/SqlppCompilationProvider.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/SqlppCompilationProvider.java
@@ -90,7 +90,7 @@ public class SqlppCompilationProvider implements
ILangCompilationProvider {
CompilerProperties.COMPILER_SORT_SAMPLES_KEY,
CompilerProperties.COMPILER_EXTERNALSCANMEMORY_KEY,
CompilerProperties.COMPILER_INDEXONLY_KEY,
CompilerProperties.COMPILER_INTERNAL_SANITYCHECK_KEY,
CompilerProperties.COMPILER_EXTERNAL_FIELD_PUSHDOWN_KEY,
CompilerProperties.COMPILER_SUBPLAN_MERGE_KEY,
- CompilerProperties.COMPILER_SUBPLAN_NESTEDPUSHDOWN_KEY,
CompilerProperties.COMPILER_ORDERFIELDS_KEY,
+ CompilerProperties.COMPILER_SUBPLAN_NESTEDPUSHDOWN_KEY,
CompilerProperties.COMPILER_ORDERED_FIELDS_KEY,
CompilerProperties.COMPILER_ARRAYINDEX_KEY,
CompilerProperties.COMPILER_CBO_KEY,
CompilerProperties.COMPILER_CBO_TEST_KEY,
CompilerProperties.COMPILER_FORCE_JOIN_ORDER_KEY,
CompilerProperties.COMPILER_QUERY_PLAN_SHAPE_KEY,
CompilerProperties.COMPILER_MIN_MEMORY_ALLOCATION_KEY,
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
index db7c21a558..be36225e54 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java
@@ -238,8 +238,8 @@ public class APIFramework {
Map<String, Object> querySpecificConfig = validateConfig(config,
sourceLoc);
final PhysicalOptimizationConfig physOptConf =
OptimizationConfUtil.createPhysicalOptimizationConf(
compilerProperties, querySpecificConfig,
configurableParameterNames, sourceLoc);
- if (!config.containsKey(CompilerProperties.COMPILER_ORDERFIELDS_KEY)) {
- config.put(CompilerProperties.COMPILER_ORDERFIELDS_KEY,
Boolean.toString(physOptConf.isOrderField()));
+ if
(!config.containsKey(CompilerProperties.COMPILER_ORDERED_FIELDS_KEY)) {
+ config.put(CompilerProperties.COMPILER_ORDERED_FIELDS_KEY,
Boolean.toString(physOptConf.isOrderField()));
}
boolean cboMode = physOptConf.getCBOMode() ||
physOptConf.getCBOTestMode();
diff --git a/asterixdb/asterix-app/src/main/resources/cc.conf
b/asterixdb/asterix-app/src/main/resources/cc.conf
index e0eb88d595..f5a496c95b 100644
--- a/asterixdb/asterix-app/src/main/resources/cc.conf
+++ b/asterixdb/asterix-app/src/main/resources/cc.conf
@@ -59,6 +59,7 @@ compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
compiler.sort.parallel=false
compiler.internal.sanitycheck=true
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
storage.buffercache.pagesize=32KB
diff --git a/asterixdb/asterix-app/src/main/resources/cc2.conf
b/asterixdb/asterix-app/src/main/resources/cc2.conf
index 8868a5423a..bb2e4575e9 100644
--- a/asterixdb/asterix-app/src/main/resources/cc2.conf
+++ b/asterixdb/asterix-app/src/main/resources/cc2.conf
@@ -53,6 +53,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
compiler.parallelism=-1
messaging.frame.size=4096
messaging.frame.count=512
diff --git a/asterixdb/asterix-app/src/main/resources/cc3.conf
b/asterixdb/asterix-app/src/main/resources/cc3.conf
index 71ad17b62c..cc83da0ee0 100644
--- a/asterixdb/asterix-app/src/main/resources/cc3.conf
+++ b/asterixdb/asterix-app/src/main/resources/cc3.conf
@@ -53,6 +53,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
compiler.parallelism=3
messaging.frame.size=4096
messaging.frame.count=512
diff --git a/asterixdb/asterix-app/src/main/resources/cc4.conf
b/asterixdb/asterix-app/src/main/resources/cc4.conf
index bf37499874..0d5b9adf44 100644
--- a/asterixdb/asterix-app/src/main/resources/cc4.conf
+++ b/asterixdb/asterix-app/src/main/resources/cc4.conf
@@ -50,6 +50,7 @@ compiler.sortmemory=320KB
compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
compiler.parallelism=-1
diff --git a/asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf
b/asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf
index ab028c859b..6b497e28d0 100644
--- a/asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf
+++ b/asterixdb/asterix-app/src/main/resources/cc_no_cbo.conf
@@ -60,6 +60,7 @@ compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
compiler.sort.parallel=false
+compiler.ordered.fields=false
compiler.internal.sanitycheck=true
messaging.frame.size=4096
messaging.frame.count=512
diff --git
a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
index 9d28e55725..26db39f861 100644
--- a/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
+++ b/asterixdb/asterix-app/src/main/resources/cc_static_partitioning.conf
@@ -58,6 +58,7 @@ compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
compiler.sort.parallel=false
+compiler.ordered.fields=false
compiler.internal.sanitycheck=true
messaging.frame.size=4096
messaging.frame.count=512
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index e312b01ff0..54b4004044 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -74,6 +74,7 @@ public class AsterixHyracksIntegrationUtil {
public static final int DEFAULT_HYRACKS_CC_CLUSTER_PORT = 1099;
public static final String RESOURCES_PATH =
joinPath(getProjectPath().toString(), "src", "test", "resources");
public static final String DEFAULT_CONF_FILE = joinPath(RESOURCES_PATH,
"cc.conf");
+ public static final String DEFAULT_MAIN_CONF_FILE =
joinPath(RESOURCES_PATH, "cc-main.conf");
private static final String DEFAULT_STORAGE_PATH = joinPath("target",
"io", "dir");
private static String storagePath = DEFAULT_STORAGE_PATH;
private static final long RESULT_TTL = TimeUnit.MINUTES.toMillis(30);
@@ -469,7 +470,7 @@ public class AsterixHyracksIntegrationUtil {
private static String getConfPath() {
String providedPath = System.getProperty("conf.path");
if (providedPath == null) {
- return DEFAULT_CONF_FILE;
+ return DEFAULT_MAIN_CONF_FILE;
}
return joinPath(RESOURCES_PATH, providedPath);
}
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/CloudStorageIntegrationUtil.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/CloudStorageIntegrationUtil.java
index 47c059918a..6ee625f8d1 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/CloudStorageIntegrationUtil.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/common/CloudStorageIntegrationUtil.java
@@ -24,7 +24,7 @@ import static org.apache.hyracks.util.file.FileUtil.joinPath;
public class CloudStorageIntegrationUtil extends AsterixHyracksIntegrationUtil
{
public static final String RESOURCES_PATH =
joinPath(getProjectPath().toString(), "src", "test", "resources");
- public static final String CONFIG_FILE = joinPath(RESOURCES_PATH,
"cc-cloud-storage.conf");
+ public static final String CONFIG_FILE = joinPath(RESOURCES_PATH,
"cc-cloud-storage-main.conf");
public static void main(String[] args) throws Exception {
boolean cleanStart = Boolean.getBoolean("cleanup.start");
diff --git
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
index 8b71d89d03..e9060391ed 100644
---
a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
+++
b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
@@ -3035,7 +3035,7 @@ public class TestExecutor {
LOGGER.error("was expecting the following warnings: ");
}
for (int i = expectedWarnings.nextSetBit(0); i >= 0; i =
expectedWarnings.nextSetBit(i + 1)) {
- LOGGER.error(expectedWarn.get(i));
+ LOGGER.error(expectedWarn.get(i).getValue());
}
throw new Exception(msg);
}
diff --git a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
index 93a4d15cc4..c65bca8cf5 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-analyze.conf
@@ -54,4 +54,5 @@ log.dir = logs/
log.level = INFO
compiler.groupmemory=64MB
storage.buffercache.pagesize=32KB
-compiler.internal.sanitycheck=true
\ No newline at end of file
+compiler.internal.sanitycheck=true
+compiler.ordered.fields=false
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/cc-cbotest.conf
b/asterixdb/asterix-app/src/test/resources/cc-cbotest.conf
index 3a1ac4fcba..aa7e6a27c7 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-cbotest.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-cbotest.conf
@@ -62,6 +62,7 @@ compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
compiler.sort.parallel=false
+compiler.ordered.fields=false
compiler.internal.sanitycheck=true
messaging.frame.size=4096
messaging.frame.count=512
diff --git
a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-azblob.conf
b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-azblob.conf
index d11cb5ec5b..4af4fd0485 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-azblob.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-azblob.conf
@@ -58,6 +58,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
compiler.internal.sanitycheck=true
messaging.frame.size=4096
messaging.frame.count=512
diff --git a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf
b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf
index 518cc71036..325143962a 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf
@@ -58,6 +58,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
compiler.internal.sanitycheck=true
messaging.frame.size=4096
messaging.frame.count=512
diff --git a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-main.conf
similarity index 98%
copy from asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
copy to asterixdb/asterix-app/src/test/resources/cc-cloud-storage-main.conf
index 5672cdecef..a9f2aace9e 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-main.conf
@@ -71,4 +71,4 @@ cloud.storage.endpoint=http://127.0.0.1:8001
cloud.storage.anonymous.auth=true
cloud.storage.cache.policy=selective
cloud.max.write.requests.per.second=2000
-cloud.max.read.requests.per.second=4000
+cloud.max.read.requests.per.second=4000
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
index 5672cdecef..64fc40fb08 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage.conf
@@ -58,6 +58,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
compiler.internal.sanitycheck=true
messaging.frame.size=4096
messaging.frame.count=512
diff --git a/asterixdb/asterix-app/src/test/resources/cc-columnar.conf
b/asterixdb/asterix-app/src/test/resources/cc-columnar.conf
index 11feeccfba..e01bbbd9a4 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-columnar.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-columnar.conf
@@ -57,6 +57,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
storage.buffercache.pagesize=32KB
diff --git a/asterixdb/asterix-app/src/test/resources/cc.conf
b/asterixdb/asterix-app/src/test/resources/cc-main.conf
similarity index 98%
copy from asterixdb/asterix-app/src/test/resources/cc.conf
copy to asterixdb/asterix-app/src/test/resources/cc-main.conf
index 624455c594..cdc3e6bb0f 100644
--- a/asterixdb/asterix-app/src/test/resources/cc.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-main.conf
@@ -60,4 +60,4 @@ compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
messaging.frame.size=4096
messaging.frame.count=512
-storage.buffercache.pagesize=32KB
+storage.buffercache.pagesize=32KB
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf
b/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf
index d59d4d58c5..20549a8de8 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf
@@ -58,6 +58,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
compiler.batch.lookup=false
messaging.frame.size=4096
messaging.frame.count=512
diff --git a/asterixdb/asterix-app/src/test/resources/cc-single-partition.conf
b/asterixdb/asterix-app/src/test/resources/cc-single-partition.conf
index dab765bfb7..aeb9361c47 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-single-partition.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-single-partition.conf
@@ -49,6 +49,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
storage.buffercache.pagesize=32KB
diff --git a/asterixdb/asterix-app/src/test/resources/cc-single.conf
b/asterixdb/asterix-app/src/test/resources/cc-single.conf
index a6f4e8999a..76b29d7e25 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-single.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-single.conf
@@ -45,6 +45,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
storage.buffercache.pagesize=32KB
diff --git
a/asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf
b/asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf
index ae91f5e10d..79a805b751 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-small-txn-log-partition.conf
@@ -49,6 +49,7 @@ compiler.sortmemory=320KB
compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
txn.log.partitionsize=2MB
diff --git a/asterixdb/asterix-app/src/test/resources/cc-ssl.conf
b/asterixdb/asterix-app/src/test/resources/cc-ssl.conf
index 547beff9b7..086944b033 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-ssl.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-ssl.conf
@@ -64,6 +64,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
ssl.enabled=true
diff --git a/asterixdb/asterix-app/src/test/resources/cc-storage.conf
b/asterixdb/asterix-app/src/test/resources/cc-storage.conf
index 68faa17905..f3a39ab8aa 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-storage.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-storage.conf
@@ -50,6 +50,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
storage.buffercache.pagesize=32KB
diff --git a/asterixdb/asterix-app/src/test/resources/cc.conf
b/asterixdb/asterix-app/src/test/resources/cc.conf
index 624455c594..075d865c79 100644
--- a/asterixdb/asterix-app/src/test/resources/cc.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc.conf
@@ -58,6 +58,7 @@ compiler.groupmemory=160KB
compiler.joinmemory=256KB
compiler.textsearchmemory=160KB
compiler.windowmemory=192KB
+compiler.ordered.fields=false
messaging.frame.size=4096
messaging.frame.count=512
storage.buffercache.pagesize=32KB
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
index 9d538056dc..7c963a7cdc 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
@@ -47,7 +47,7 @@
"compiler\.min\.memory\.allocation" : true,
"compiler.min.sortmemory" : 524288,
"compiler.min.windowmemory" : 524288,
- "compiler.orderfields" : false,
+ "compiler.ordered.fields" : false,
"compiler\.parallelism" : 0,
"compiler.queryplanshape" : "zigzag",
"compiler.runtime.memory.overhead" : 5,
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
index 0b23562c30..50927b4d8f 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
@@ -47,7 +47,7 @@
"compiler\.min\.memory\.allocation" : true,
"compiler.min.sortmemory" : 524288,
"compiler.min.windowmemory" : 524288,
- "compiler.orderfields" : false,
+ "compiler.ordered.fields" : false,
"compiler\.parallelism" : -1,
"compiler.queryplanshape" : "zigzag",
"compiler.runtime.memory.overhead" : 5,
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
index 0d77d056c5..1b035a0a21 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
@@ -47,7 +47,7 @@
"compiler\.min\.memory\.allocation" : true,
"compiler.min.sortmemory" : 524288,
"compiler.min.windowmemory" : 524288,
- "compiler.orderfields" : false,
+ "compiler.ordered.fields" : false,
"compiler\.parallelism" : 3,
"compiler.queryplanshape" : "zigzag",
"compiler.runtime.memory.overhead" : 5,
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java
index 6f11e1e9cd..a7e39c9b2a 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/CompilerProperties.java
@@ -157,7 +157,7 @@ public class CompilerProperties extends AbstractProperties {
getRangedIntegerType(0, Integer.MAX_VALUE),
128,
"Maximum occurrences of a variable allowed in an expression
for inlining"),
- COMPILER_ORDERFIELDS(BOOLEAN, AlgebricksConfig.ORDERED_FIELDS,
"Enable/disable select order list");
+ COMPILER_ORDERED_FIELDS(BOOLEAN, AlgebricksConfig.ORDERED_FIELDS,
"Enable/disable select order list");
private final IOptionType type;
private final Object defaultValue;
@@ -242,7 +242,7 @@ public class CompilerProperties extends AbstractProperties {
public static final String COMPILER_MAX_VARIABLE_OCCURRENCES_INLINING_KEY =
Option.COMPILER_MAX_VARIABLE_OCCURRENCES_INLINING.ini();
- public static final String COMPILER_ORDERFIELDS_KEY =
Option.COMPILER_ORDERFIELDS.ini();
+ public static final String COMPILER_ORDERED_FIELDS_KEY =
Option.COMPILER_ORDERED_FIELDS.ini();
public static final int COMPILER_PARALLELISM_AS_STORAGE = 0;
@@ -373,7 +373,7 @@ public class CompilerProperties extends AbstractProperties {
}
public boolean isOrderedFields() {
- return accessor.getBoolean(Option.COMPILER_ORDERFIELDS);
+ return accessor.getBoolean(Option.COMPILER_ORDERED_FIELDS);
}
public int getRuntimeMemoryOverheadPercentage() {
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/OptimizationConfUtil.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/OptimizationConfUtil.java
index fe5ec9e096..c866d223a6 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/OptimizationConfUtil.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/config/OptimizationConfUtil.java
@@ -97,7 +97,7 @@ public class OptimizationConfUtil {
compilerProperties.isColumnFilter());
int maxVariableOccurrencesForInlining =
getMaxVariableOccurrencesForInlining(compilerProperties,
querySpecificConfig, sourceLoc);
- boolean orderFields = getBoolean(querySpecificConfig,
CompilerProperties.COMPILER_ORDERFIELDS_KEY,
+ boolean orderFields = getBoolean(querySpecificConfig,
CompilerProperties.COMPILER_ORDERED_FIELDS_KEY,
compilerProperties.isOrderedFields());
PhysicalOptimizationConfig physOptConf = new
PhysicalOptimizationConfig();
diff --git
a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/OpenRecordConstructorResultType.java
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/OpenRecordConstructorResultType.java
index bc3ae60879..8358627c93 100644
---
a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/OpenRecordConstructorResultType.java
+++
b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/typecomputer/impl/OpenRecordConstructorResultType.java
@@ -68,8 +68,8 @@ public class OpenRecordConstructorResultType implements
IResultTypeComputer {
boolean orderFields = AlgebricksConfig.ORDERED_FIELDS;
if (metadataProvider != null) {
Map<String, Object> config = metadataProvider.getConfig();
- orderFields = Boolean.parseBoolean((String)
config.getOrDefault(CompilerProperties.COMPILER_ORDERFIELDS_KEY,
- String.valueOf(orderFields)));
+ orderFields = Boolean.parseBoolean((String) config
+
.getOrDefault(CompilerProperties.COMPILER_ORDERED_FIELDS_KEY,
String.valueOf(orderFields)));
}
Iterator<Mutable<ILogicalExpression>> argIter =
f.getArguments().iterator();
diff --git
a/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
b/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
index 1c6d574edb..5b159ea02a 100644
--- a/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
+++ b/asterixdb/asterix-server/src/test/resources/NCServiceExecutionIT/cc.conf
@@ -47,4 +47,5 @@ heartbeat.max.misses=25
[common]
log.dir = ../asterix-server/target/NCServiceExecutionIT
-log.level = INFO
\ No newline at end of file
+log.level = INFO
+compiler.ordered.fields=false
\ No newline at end of file
diff --git a/asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf
b/asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf
index a91622b493..a5a437a477 100644
--- a/asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf
+++ b/asterixdb/asterix-server/src/test/resources/NcLifecycleIT/cc.conf
@@ -47,3 +47,4 @@ heartbeat.max.misses=25
[common]
log.level = INFO
log.dir=../asterix-server/target/NcLifecycleIT
+compiler.ordered.fields=false
\ No newline at end of file
diff --git a/asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf
b/asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf
index b88cbd4595..bef0a3cbf7 100644
--- a/asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf
+++ b/asterixdb/asterix-server/src/test/resources/ReplicationIT/cc.conf
@@ -51,3 +51,4 @@ log.dir=../asterix-server/target/ReplicationIT
replication.enabled=true
replication.strategy=all
replication.factor=2
+compiler.ordered.fields=false
\ No newline at end of file
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java
index 0b29f7d97b..ccb568cf1f 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java
@@ -46,6 +46,6 @@ public class AlgebricksConfig {
StorageUtil.getIntSizeInBytes(8, StorageUtil.StorageUnit.KILOBYTE);
public static final boolean BATCH_LOOKUP_DEFAULT = true;
public static final boolean COLUMN_FILTER_DEFAULT = true;
- public static final boolean ORDERED_FIELDS = false;
+ public static final boolean ORDERED_FIELDS = true;
public static final int MAX_VARIABLE_OCCURRENCES_INLINING_DEFAULT = 128;
}
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/PhysicalOptimizationConfig.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/PhysicalOptimizationConfig.java
index 163fb164b6..7419964080 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/PhysicalOptimizationConfig.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/rewriter/base/PhysicalOptimizationConfig.java
@@ -64,7 +64,7 @@ public class PhysicalOptimizationConfig {
private static final String MIN_WINDOW_FRAMES = "MIN_WINDOW_FRAMES";
private static final String MAX_VARIABLE_OCCURRENCES_INLINING =
"MAX_VARIABLE_OCCURRENCES_INLINING";
- private static final String ORDER_FIELDS = "ORDER_FIELDS";
+ private static final String ORDER_FIELDS = "ORDERED_FIELDS";
private final Properties properties = new Properties();
