You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by im...@apache.org on 2019/03/04 21:08:53 UTC
[asterixdb] 06/09: [NO ISSUE] Put asterix-server components in
folder
This is an automated email from the ASF dual-hosted git repository.
imaxon pushed a commit to branch release-0.9.4.1
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit f14eab42521ff7468b3506dbb04b77cd0aca62d1
Author: Ian Maxon <im...@apache.org>
AuthorDate: Thu Aug 30 18:33:18 2018 -0700
[NO ISSUE] Put asterix-server components in folder
Change-Id: I6281454bcd6b3f4a6c0f14d0c5b1d082efdd0955
Reviewed-on: https://asterix-gerrit.ics.uci.edu/2880
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Michael Blow <mb...@apache.org>
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3198
Tested-by: Michael Blow <mb...@apache.org>
---
asterixdb/asterix-server/pom.xml | 8 ++++----
.../src/main/assembly/binary-assembly.xml | 20 ++++++++++----------
.../org/apache/asterix/test/server/LicensingIT.java | 5 +++++
.../org/apache/asterix/test/server/RecoveryIT.java | 15 +++++++--------
.../asterix/test/server/SampleLocalClusterIT.java | 10 ++++++----
.../big_object_20M/big_object_20M.3.update.aql | 2 +-
.../primary_index_only.3.update.aql | 2 +-
.../primary_index_only_filtered.3.update.aql | 2 +-
.../primary_plus_correlated_ngram_index.3.update.aql | 2 +-
.../primary_plus_correlated_rtree_index.3.update.aql | 2 +-
...s_default_correlated_secondary_index.3.update.aql | 2 +-
...primary_plus_default_secondary_index.3.update.aql | 2 +-
...lus_default_secondary_index_filtered.3.update.aql | 2 +-
...s_keyword_correlated_secondary_index.3.update.aql | 2 +-
...primary_plus_keyword_secondary_index.3.update.aql | 2 +-
...lus_keyword_secondary_index_filtered.3.update.aql | 2 +-
...ultiple_correlated_secondary_indices.3.update.aql | 2 +-
...mary_plus_multiple_secondary_indices.3.update.aql | 2 +-
..._multiple_secondary_indices_filtered.3.update.aql | 2 +-
.../primary_plus_ngram_index.3.update.aql | 2 +-
.../primary_plus_ngram_index_filtered.3.update.aql | 2 +-
.../primary_plus_rtree_index.3.update.aql | 2 +-
.../primary_plus_rtree_index_filtered.3.update.aql | 2 +-
...y_plus_rtree_index_insert_and_delete.3.update.aql | 2 +-
...ree_index_insert_and_delete_filtered.3.update.aql | 2 +-
.../delete_after_recovery.3.update.aql | 2 +-
.../insert_after_recovery.3.update.aql | 2 +-
.../load_after_recovery.5.update.aql | 2 +-
.../hyracks/test/support/LicensingTestBase.java | 12 +++++++++---
29 files changed, 64 insertions(+), 52 deletions(-)
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index da6f097..7049475 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -484,23 +484,23 @@
<configuration>
<dataSet>
<data>
- <src>${project.build.directory}/${project.build.finalName}-binary-assembly/</src>
+ <src>${project.build.directory}/${project.build.finalName}-binary-assembly/apache-asterixdb-${project.version}/</src>
<excludes>bin/**</excludes>
<type>directory</type>
<mapper>
<type>perm</type>
- <prefix>/opt/apache-asterixdb/</prefix>
+ <prefix>/opt/apache-asterixdb-${project.version}/</prefix>
<user>asterixdb</user>
<group>asterixdb</group>
<filemode>644</filemode>
</mapper>
</data>
<data>
- <src>${project.build.directory}/${project.build.finalName}-binary-assembly/bin</src>
+ <src>${project.build.directory}/${project.build.finalName}-binary-assembly/apache-asterixdb-${project.version}/bin</src>
<type>directory</type>
<mapper>
<type>perm</type>
- <prefix>/opt/apache-asterixdb/bin</prefix>
+ <prefix>/opt/apache-asterixdb-${project.version}/bin</prefix>
<user>asterixdb</user>
<group>asterixdb</group>
<filemode>754</filemode>
diff --git a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
index 37f0e00..c84cec0 100644
--- a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
+++ b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
@@ -28,7 +28,7 @@
<fileSets>
<fileSet>
<directory>target/generated-sources</directory>
- <outputDirectory>.</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/</outputDirectory>
<includes>
<include>LICENSE*</include>
<include>NOTICE*</include>
@@ -36,7 +36,7 @@
</fileSet>
<fileSet>
<directory>src/main/opt</directory>
- <outputDirectory>opt</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/opt</outputDirectory>
<excludes>
<exclude>**/*.sh</exclude>
</excludes>
@@ -44,7 +44,7 @@
</fileSet>
<fileSet>
<directory>src/main/opt</directory>
- <outputDirectory>opt</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/opt</outputDirectory>
<includes>
<include>**/*.sh</include>
</includes>
@@ -53,7 +53,7 @@
</fileSet>
<fileSet>
<directory>src/main/opt/ansible/yaml</directory>
- <outputDirectory>opt/aws/yaml</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/opt/aws/yaml</outputDirectory>
<includes>
<include>**/*.yml</include>
</includes>
@@ -61,7 +61,7 @@
</fileSet>
<fileSet>
<directory>src/main/opt/ansible/conf</directory>
- <outputDirectory>opt/aws/conf</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/opt/aws/conf</outputDirectory>
<includes>
<include>**/instance_settings.yml</include>
</includes>
@@ -69,16 +69,16 @@
</fileSet>
<fileSet>
<directory>target/appassembler/repo</directory>
- <outputDirectory>repo</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/repo</outputDirectory>
</fileSet>
<fileSet>
<directory>target/appassembler/bin</directory>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>target/generated-resources/appassembler/booter-windows/etc</directory>
- <outputDirectory>etc</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/etc</outputDirectory>
<includes>
<include>*.xml</include>
</includes>
@@ -86,7 +86,7 @@
<fileSet>
<directory>target/generated-resources/appassembler/booter-windows/bin</directory>
- <outputDirectory>bin</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}/bin</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
@@ -94,7 +94,7 @@
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<unpack>true</unpack>
- <outputDirectory>.</outputDirectory>
+ <outputDirectory>apache-asterixdb-${project.version}</outputDirectory>
<includes>
<include>org.apache.asterix:asterix-client-helper:zip:assembly:*</include>
</includes>
diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/LicensingIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/LicensingIT.java
index 60406b8..0c8df08 100644
--- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/LicensingIT.java
+++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/LicensingIT.java
@@ -46,6 +46,11 @@ public class LicensingIT extends LicensingTestBase {
}
@Override
+ protected String getTopLevelDirPattern() {
+ return "apache-asterixdb.*";
+ }
+
+ @Override
protected String pathToLicensingFiles() {
return "";
}
diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java
index ba367a7..308920b 100644
--- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java
+++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/RecoveryIT.java
@@ -53,6 +53,8 @@ public class RecoveryIT {
private static File installerTargetPath;
private static String ncServiceHomeDirName;
private static String ncServiceHomePath;
+ private static String ncServiceSubDirName;
+ private static String ncServiceSubPath;
private static String scriptHomePath;
private static String reportPath;
private static ProcessBuilder pb;
@@ -74,14 +76,11 @@ public class RecoveryIT {
asterixInstallerPath = new File(System.getProperty("user.dir"));
installerTargetPath = new File(new File(asterixInstallerPath.getParentFile(), "asterix-server"), "target");
reportPath = new File(installerTargetPath, "failsafe-reports").getAbsolutePath();
- ncServiceHomeDirName = installerTargetPath.list(new FilenameFilter() {
- @Override
- public boolean accept(File dir, String name) {
- return new File(dir, name).isDirectory() && name.startsWith("asterix-server")
- && name.endsWith("binary-assembly");
- }
- })[0];
- ncServiceHomePath = new File(installerTargetPath, ncServiceHomeDirName).getAbsolutePath();
+ ncServiceSubDirName =
+ installerTargetPath.list((dir, name) -> name.matches("asterix-server.*binary-assembly"))[0];
+ ncServiceSubPath = new File(installerTargetPath, ncServiceSubDirName).getAbsolutePath();
+ ncServiceHomeDirName = new File(ncServiceSubPath).list(((dir, name) -> name.matches("apache-asterixdb.*")))[0];
+ ncServiceHomePath = new File(ncServiceSubPath, ncServiceHomeDirName).getAbsolutePath();
LOGGER.info("NCSERVICE_HOME=" + ncServiceHomePath);
diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SampleLocalClusterIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SampleLocalClusterIT.java
index defd378..0479bb2 100644
--- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SampleLocalClusterIT.java
+++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/test/server/SampleLocalClusterIT.java
@@ -58,7 +58,7 @@ public class SampleLocalClusterIT {
// src/test/resources/NCServiceExecutionIT/cc.conf.
private static final String OUTPUT_DIR = joinPath(TARGET_DIR, "sample local cluster");
- private static final String LOCAL_SAMPLES_DIR = joinPath(OUTPUT_DIR, "opt", "local");
+ private static String localSamplesDir;
@Rule
public TestRule watcher = new TestMethodTracer();
@@ -79,6 +79,8 @@ public class SampleLocalClusterIT {
String installerZip = joinPath(pathElements);
TestHelper.unzip(installerZip, OUTPUT_DIR);
+ String tlpName = new File(OUTPUT_DIR).list((dir, name) -> name.matches("apache-asterixdb.*"))[0];
+ localSamplesDir = joinPath(OUTPUT_DIR, tlpName, "opt", "local");
}
@@ -109,9 +111,9 @@ public class SampleLocalClusterIT {
@Test
public void test0_startCluster() throws Exception {
Process process =
- new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop-sample-cluster.sh"), "-f").inheritIO().start();
+ new ProcessBuilder(joinPath(localSamplesDir, "bin/stop-sample-cluster.sh"), "-f").inheritIO().start();
Assert.assertEquals(0, process.waitFor());
- process = new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/start-sample-cluster.sh")).inheritIO().start();
+ process = new ProcessBuilder(joinPath(localSamplesDir, "bin/start-sample-cluster.sh")).inheritIO().start();
Assert.assertEquals(0, process.waitFor());
}
@@ -130,7 +132,7 @@ public class SampleLocalClusterIT {
@Test
public void test2_stopCluster() throws Exception {
Process process =
- new ProcessBuilder(joinPath(LOCAL_SAMPLES_DIR, "bin/stop-sample-cluster.sh")).inheritIO().start();
+ new ProcessBuilder(joinPath(localSamplesDir, "bin/stop-sample-cluster.sh")).inheritIO().start();
Assert.assertEquals(0, process.waitFor());
try {
new URL("http://127.0.0.1:19002").openConnection().connect();
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/query_after_restart/big_object_20M/big_object_20M.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/query_after_restart/big_object_20M/big_object_20M.3.update.aql
index 9b2960d..b99ccdc 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/query_after_restart/big_object_20M/big_object_20M.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/query_after_restart/big_object_20M/big_object_20M.3.update.aql
@@ -29,4 +29,4 @@ set hash_merge "true"
load dataset testds
using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/target/data/big-object/big_object_20M.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/target/data/big-object/big_object_20M.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_index_only/primary_index_only.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_index_only/primary_index_only.3.update.aql
index 31fd5e3..ab07679 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_index_only/primary_index_only.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_index_only/primary_index_only.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_index_only_filtered/primary_index_only_filtered.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_index_only_filtered/primary_index_only_filtered.3.update.aql
index a44f3f1..cb8afd6 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_index_only_filtered/primary_index_only_filtered.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_index_only_filtered/primary_index_only_filtered.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_correlated_ngram_index/primary_plus_correlated_ngram_index.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_correlated_ngram_index/primary_plus_correlated_ngram_index.3.update.aql
index f55701e..5558005 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_correlated_ngram_index/primary_plus_correlated_ngram_index.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_correlated_ngram_index/primary_plus_correlated_ngram_index.3.update.aql
@@ -20,4 +20,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_correlated_rtree_index/primary_plus_correlated_rtree_index.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_correlated_rtree_index/primary_plus_correlated_rtree_index.3.update.aql
index 9b0e47d..f48ccd5 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_correlated_rtree_index/primary_plus_correlated_rtree_index.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_correlated_rtree_index/primary_plus_correlated_rtree_index.3.update.aql
@@ -21,4 +21,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_correlated_secondary_index/primary_plus_default_correlated_secondary_index.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_correlated_secondary_index/primary_plus_default_correlated_secondary_index.3.update.aql
index 7c99165..6a18e6e 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_correlated_secondary_index/primary_plus_default_correlated_secondary_index.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_correlated_secondary_index/primary_plus_default_correlated_secondary_index.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_secondary_index/primary_plus_default_secondary_index.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_secondary_index/primary_plus_default_secondary_index.3.update.aql
index e286a80..9bbef93 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_secondary_index/primary_plus_default_secondary_index.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_secondary_index/primary_plus_default_secondary_index.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_secondary_index_filtered/primary_plus_default_secondary_index_filtered.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_secondary_index_filtered/primary_plus_default_secondary_index_filtered.3.update.aql
index e286a80..9bbef93 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_secondary_index_filtered/primary_plus_default_secondary_index_filtered.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_default_secondary_index_filtered/primary_plus_default_secondary_index_filtered.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_correlated_secondary_index/primary_plus_keyword_correlated_secondary_index.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_correlated_secondary_index/primary_plus_keyword_correlated_secondary_index.3.update.aql
index 9b0e47d..f48ccd5 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_correlated_secondary_index/primary_plus_keyword_correlated_secondary_index.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_correlated_secondary_index/primary_plus_keyword_correlated_secondary_index.3.update.aql
@@ -21,4 +21,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.3.update.aql
index e286a80..9bbef93 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_secondary_index_filtered/primary_plus_keyword_secondary_index_filtered.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_secondary_index_filtered/primary_plus_keyword_secondary_index_filtered.3.update.aql
index d52fe3e..0f245b5 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_secondary_index_filtered/primary_plus_keyword_secondary_index_filtered.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_keyword_secondary_index_filtered/primary_plus_keyword_secondary_index_filtered.3.update.aql
@@ -27,4 +27,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_correlated_secondary_indices/primary_plus_multiple_correlated_secondary_indices.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_correlated_secondary_indices/primary_plus_multiple_correlated_secondary_indices.3.update.aql
index 9b0e47d..f48ccd5 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_correlated_secondary_indices/primary_plus_multiple_correlated_secondary_indices.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_correlated_secondary_indices/primary_plus_multiple_correlated_secondary_indices.3.update.aql
@@ -21,4 +21,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.3.update.aql
index cc626b5..66adcef 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.3.update.aql
@@ -27,4 +27,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_secondary_indices_filtered/primary_plus_multiple_secondary_indices_filtered.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_secondary_indices_filtered/primary_plus_multiple_secondary_indices_filtered.3.update.aql
index d52fe3e..0f245b5 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_secondary_indices_filtered/primary_plus_multiple_secondary_indices_filtered.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_multiple_secondary_indices_filtered/primary_plus_multiple_secondary_indices_filtered.3.update.aql
@@ -27,4 +27,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_ngram_index/primary_plus_ngram_index.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_ngram_index/primary_plus_ngram_index.3.update.aql
index eef562a..ce01110 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_ngram_index/primary_plus_ngram_index.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_ngram_index/primary_plus_ngram_index.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_ngram_index_filtered/primary_plus_ngram_index_filtered.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_ngram_index_filtered/primary_plus_ngram_index_filtered.3.update.aql
index e286a80..9bbef93 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_ngram_index_filtered/primary_plus_ngram_index_filtered.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_ngram_index_filtered/primary_plus_ngram_index_filtered.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.3.update.aql
index e286a80..9bbef93 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index/primary_plus_rtree_index.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_filtered/primary_plus_rtree_index_filtered.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_filtered/primary_plus_rtree_index_filtered.3.update.aql
index d52fe3e..0f245b5 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_filtered/primary_plus_rtree_index_filtered.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_filtered/primary_plus_rtree_index_filtered.3.update.aql
@@ -27,4 +27,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_insert_and_delete/primary_plus_rtree_index_insert_and_delete.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_insert_and_delete/primary_plus_rtree_index_insert_and_delete.3.update.aql
index ef59319..1d24079 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_insert_and_delete/primary_plus_rtree_index_insert_and_delete.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_insert_and_delete/primary_plus_rtree_index_insert_and_delete.3.update.aql
@@ -26,4 +26,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_insert_and_delete_filtered/primary_plus_rtree_index_insert_and_delete_filtered.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_insert_and_delete_filtered/primary_plus_rtree_index_insert_and_delete_filtered.3.update.aql
index ef59319..1d24079 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_insert_and_delete_filtered/primary_plus_rtree_index_insert_and_delete_filtered.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recover_after_abort/primary_plus_rtree_index_insert_and_delete_filtered/primary_plus_rtree_index_insert_and_delete_filtered.3.update.aql
@@ -26,4 +26,4 @@ use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/delete_after_recovery/delete_after_recovery.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/delete_after_recovery/delete_after_recovery.3.update.aql
index 31fd5e3..ab07679 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/delete_after_recovery/delete_after_recovery.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/delete_after_recovery/delete_after_recovery.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/insert_after_recovery/insert_after_recovery.3.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/insert_after_recovery/insert_after_recovery.3.update.aql
index 31fd5e3..ab07679 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/insert_after_recovery/insert_after_recovery.3.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/insert_after_recovery/insert_after_recovery.3.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/load_after_recovery/load_after_recovery.5.update.aql b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/load_after_recovery/load_after_recovery.5.update.aql
index 31fd5e3..ab07679 100644
--- a/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/load_after_recovery/load_after_recovery.5.update.aql
+++ b/asterixdb/asterix-server/src/test/resources/transactionts/queries/recovery_ddl/load_after_recovery/load_after_recovery.5.update.aql
@@ -26,4 +26,4 @@
use dataverse recovery;
load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
+(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
index e2ab3a3..159df9e 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/LicensingTestBase.java
@@ -37,10 +37,14 @@ public abstract class LicensingTestBase {
final String pattern = getInstallerDirPattern();
final String targetDir = getTargetDir();
final String[] list = new File(targetDir).list((dir, name) -> name.matches(pattern));
+ final String topLevelPattern = getTopLevelDirPattern();
+ final String[] topLevel =
+ new File(FileUtil.joinPath(targetDir, list[0])).list((dir, name) -> name.matches(topLevelPattern));
+ installerDir = FileUtil.joinPath(targetDir, list[0], topLevel[0]);
Assert.assertNotNull("installerDir", list);
- Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + Arrays.toString(list), list.length > 1);
- Assert.assertEquals("Can't find install dir (" + pattern + ")", 1, list.length);
- installerDir = FileUtil.joinPath(targetDir, list[0]);
+ Assert.assertFalse("Ambiguous install dir (" + pattern + "): " + Arrays.toString(topLevel),
+ list.length > 1);
+ Assert.assertEquals("Can't find install dir (" + pattern + ")", 1, topLevel.length);
}
}
@@ -48,6 +52,8 @@ public abstract class LicensingTestBase {
protected abstract String getInstallerDirPattern();
+ protected abstract String getTopLevelDirPattern();
+
protected abstract String pathToLicensingFiles();
protected abstract String[] getRequiredArtifactNames();