This is an automated email from the ASF dual-hosted git repository. mhubail pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit cbc55c14265e4e62587ffc9b6f17dfb62647df97 Merge: 76744a3c78 1e4b8c1477 Author: Murtadha Hubail <[email protected]> AuthorDate: Sat Nov 30 20:27:59 2024 +0300 Merge branch 'goldfish' into 'master' Change-Id: Id8f1f8a87df1b605d68c8a241720bbc391122d44 asterixdb/asterix-app/pom.xml | 34 ++-------------------- .../test/cloud_storage/CloudStorageGCSTest.java | 2 +- .../src/test/resources/cc-cloud-storage-gcs.conf | 2 +- asterixdb/asterix-cloud/pom.xml | 4 +-- .../org/apache/asterix/cloud/gcs/LSMGCSTest.java | 2 +- 5 files changed, 7 insertions(+), 37 deletions(-) diff --cc asterixdb/asterix-app/pom.xml index 5b2f8a42a8,950ff4ec49..0c009515b9 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@@ -422,36 -422,36 +422,6 @@@ </execution> </executions> </plugin> -- <plugin> -- <groupId>com.github.eirslett</groupId> -- <artifactId>frontend-maven-plugin</artifactId> -- <version>1.13.4</version> -- <configuration> -- <nodeVersion>v14.15.4</nodeVersion> -- <npmVersion>6.14.11</npmVersion> -- <workingDirectory>target/npm</workingDirectory> -- <installDirectory>target/npm</installDirectory> -- </configuration> -- <executions> -- <execution> -- <id>install node and yarn</id> -- <goals> -- <goal>install-node-and-npm</goal> -- </goals> -- <phase>${azurite.npm.install.stage}</phase> -- </execution> -- <execution> -- <id>azurite blob</id> -- <phase>${azurite.install.stage}</phase> -- <goals> -- <goal>npm</goal> -- </goals> -- <configuration> - <arguments>install azurite</arguments> - <arguments>install [email protected]</arguments> -- </configuration> -- </execution> -- </executions> -- </plugin> </plugins> <pluginManagement> <plugins> @@@ -590,43 -590,6 +560,43 @@@ <failIfNoTests>false</failIfNoTests> </properties> </profile> + <profile> + <id>azurite-tests</id> + <build> + <plugins> + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.13.4</version> + <configuration> + <nodeVersion>v14.15.4</nodeVersion> + <npmVersion>6.14.11</npmVersion> + <workingDirectory>target/npm</workingDirectory> + <installDirectory>target/npm</installDirectory> + </configuration> + <executions> + <execution> + <id>install node and yarn</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <phase>${azurite.npm.install.stage}</phase> + </execution> + <execution> + <id>azurite blob</id> + <phase>${azurite.install.stage}</phase> + <goals> + <goal>npm</goal> + </goals> + <configuration> - <arguments>install azurite</arguments> ++ <arguments>install [email protected]</arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <dependencies> <dependency> diff --cc asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf index 004664498e,55caad6748..518cc71036 --- a/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf +++ b/asterixdb/asterix-app/src/test/resources/cc-cloud-storage-gcs.conf @@@ -67,9 -67,6 +67,9 @@@ storage.partitioning=stati cloud.storage.scheme=gs cloud.storage.bucket=cloud-storage-container cloud.storage.region=us-west2 - cloud.storage.endpoint=http://127.0.0.1:4443 + cloud.storage.endpoint=http://127.0.0.1:24443 cloud.storage.anonymous.auth=true cloud.storage.cache.policy=selective +cloud.max.write.requests.per.second=1000 +cloud.max.read.requests.per.second=5000 +cloud.write.buffer.size=5 diff --cc asterixdb/asterix-cloud/pom.xml index 9244979632,0ab291daa5..6f952b088d --- a/asterixdb/asterix-cloud/pom.xml +++ b/asterixdb/asterix-cloud/pom.xml @@@ -16,258 -16,181 +16,258 @@@ ! specific language governing permissions and limitations ! under the License. !--> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>apache-asterixdb</artifactId> - <groupId>org.apache.asterix</groupId> - <version>0.9.10-SNAPSHOT</version> - </parent> - <artifactId>asterix-cloud</artifactId> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>apache-asterixdb</artifactId> + <groupId>org.apache.asterix</groupId> + <version>0.9.10-SNAPSHOT</version> + </parent> + <artifactId>asterix-cloud</artifactId> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - <comments>A business-friendly OSS license</comments> - </license> - </licenses> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + <comments>A business-friendly OSS license</comments> + </license> + </licenses> - <properties> - <root.dir>${basedir}/..</root.dir> - </properties> + <properties> + <root.dir>${basedir}/..</root.dir> + </properties> - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <executions> - <execution> - <id>default</id> - <phase>validate</phase> - <goals> - <goal>check</goal> - </goals> - <configuration> - <licenses> - <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/> - </licenses> - <excludes combine.children="append"> - <exclude>src/test/resources/result/**</exclude> - </excludes> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>com.googlecode.maven-download-plugin</groupId> - <artifactId>download-maven-plugin</artifactId> - <version>1.4.2</version> - <executions> - <execution> - <id>install-fake-gcs</id> - <phase>${gcs.download.stage}</phase> - <goals> - <goal>wget</goal> - </goals> - <configuration> - <url>https://github.com/fsouza/fake-gcs-server/releases/download/v1.48.0/fake-gcs-server_1.48.0_Linux_amd64.tar.gz</url> - <outputFileName>fake-gcs-server_1.48.0_Linux_amd64.tar.gz</outputFileName> - <outputDirectory>${project.build.directory}</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>extract-gcs</id> - <phase>${gcs.install.stage}</phase> - <configuration> - <target> - <echo message="Extracting fake-gcs-server" /> - <mkdir dir="${project.build.directory}/fake-gcs-server" /> - <gunzip src="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar.gz" dest="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar" /> - <untar src="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar" dest="${project.build.directory}/fake-gcs-server" /> - <chmod file="${project.build.directory}/fake-gcs-server/fake-gcs-server" perm="ugo+rx" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>fake-gcs-server</id> - <phase>${gcs.stage}</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>${project.build.directory}/fake-gcs-server/fake-gcs-server</executable> - <workingDirectory>${project.build.directory}/fake-gcs-server</workingDirectory> - <arguments> - <argument>-port</argument> - <argument>24443</argument> - <argument>-scheme</argument> - <argument>http</argument> - <argument>-host</argument> - <argument>127.0.0.1</argument> - <argument>-log-level</argument> - <argument>error</argument> - <argument>-filesystem-root</argument> - <argument>${project.build.directory}/fake-gcs-server/storage</argument> - </arguments> - <async>true</async> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> + <executions> + <execution> + <id>default</id> + <phase>validate</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <licenses> + <license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/> + </licenses> + <excludes combine.children="append"> + <exclude>src/test/resources/result/**</exclude> + </excludes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>com.googlecode.maven-download-plugin</groupId> + <artifactId>download-maven-plugin</artifactId> + <version>1.4.2</version> + <executions> + <execution> + <id>install-fake-gcs</id> + <phase>${gcs.download.stage}</phase> + <goals> + <goal>wget</goal> + </goals> + <configuration> + <url> + https://github.com/fsouza/fake-gcs-server/releases/download/v1.48.0/fake-gcs-server_1.48.0_Linux_amd64.tar.gz + </url> + <outputFileName>fake-gcs-server_1.48.0_Linux_amd64.tar.gz</outputFileName> + <outputDirectory>${project.build.directory}</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>extract-gcs</id> + <phase>${gcs.install.stage}</phase> + <configuration> + <target> + <echo message="Extracting fake-gcs-server"/> + <mkdir dir="${project.build.directory}/fake-gcs-server"/> + <gunzip src="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar.gz" + dest="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar"/> + <untar src="${project.build.directory}/fake-gcs-server_1.48.0_Linux_amd64.tar" + dest="${project.build.directory}/fake-gcs-server"/> + <chmod file="${project.build.directory}/fake-gcs-server/fake-gcs-server" perm="ugo+rx"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>fake-gcs-server</id> + <phase>${gcs.stage}</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <executable>${project.build.directory}/fake-gcs-server/fake-gcs-server</executable> + <workingDirectory>${project.build.directory}/fake-gcs-server</workingDirectory> + <arguments> + <argument>-port</argument> - <argument>4443</argument> ++ <argument>24443</argument> + <argument>-scheme</argument> + <argument>http</argument> + <argument>-host</argument> + <argument>127.0.0.1</argument> + <argument>-log-level</argument> + <argument>error</argument> + <argument>-filesystem-root</argument> + <argument>${project.build.directory}/fake-gcs-server/storage</argument> + </arguments> + <async>true</async> + </configuration> + </execution> + <execution> + <id>azurite</id> + <phase>${azurite.stage}</phase> + <goals> + <goal>exec</goal> + </goals> + <configuration> + <!--suppress UnresolvedMavenProperty --> + <executable>${project.build.directory}/npm/node_modules/.bin/azurite-blob</executable> + <workingDirectory>${project.build.directory}</workingDirectory> + <environmentVariables> + <PATH>${project.build.directory}/npm/node</PATH> + </environmentVariables> + <arguments> + <argument>--blobPort</argument> + <argument>15055</argument> + <argument>--location</argument> + <argument>${project.build.directory}/azurite</argument> + <argument>--debug</argument> + <argument>${project.build.directory}/azurite/logs/azurite-debug.log</argument> + </arguments> + <async>true</async> + <outputFile>${project.build.directory}/azurite/logs/azurite.log</outputFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <dependencies> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-cloud</artifactId> - <version>${hyracks.version}</version> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-external-data</artifactId> - <version>${project.version}</version> - </dependency> - <!-- aws s3 start --> - <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>sdk-core</artifactId> - </dependency> - <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>s3</artifactId> - </dependency> - <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>regions</artifactId> - </dependency> - <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>auth</artifactId> - </dependency> - <dependency> - <groupId>software.amazon.awssdk</groupId> - <artifactId>s3-transfer-manager</artifactId> - </dependency> - <dependency> - <groupId>software.amazon.awssdk.crt</groupId> - <artifactId>aws-crt</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>io.findify</groupId> - <artifactId>s3mock_2.12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.typesafe.akka</groupId> - <artifactId>akka-http-core_2.12</artifactId> - <scope>test</scope> - </dependency> - <!-- aws s3 end --> - </dependencies> + <profiles> + <profile> + <id>azurite-tests</id> + <build> + <plugins> + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.13.4</version> + <configuration> + <nodeVersion>v14.15.4</nodeVersion> + <npmVersion>6.14.11</npmVersion> + <workingDirectory>target/npm</workingDirectory> + <installDirectory>target/npm</installDirectory> + </configuration> + <executions> + <execution> + <id>install node and yarn</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <phase>${azurite.npm.install.stage}</phase> + </execution> + <execution> + <id>azurite blob</id> + <phase>${azurite.install.stage}</phase> + <goals> + <goal>npm</goal> + </goals> + <configuration> - <arguments>install azurite</arguments> ++ <arguments>install [email protected]</arguments> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <dependencies> + <dependency> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-cloud</artifactId> + <version>${hyracks.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.asterix</groupId> + <artifactId>asterix-external-data</artifactId> + <version>${project.version}</version> + </dependency> + <!-- aws s3 start --> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>sdk-core</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>s3</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>regions</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>auth</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk</groupId> + <artifactId>s3-transfer-manager</artifactId> + </dependency> + <dependency> + <groupId>software.amazon.awssdk.crt</groupId> + <artifactId>aws-crt</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>io.findify</groupId> + <artifactId>s3mock_2.12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.typesafe.akka</groupId> + <artifactId>akka-http-core_2.12</artifactId> + <scope>test</scope> + </dependency> + <!-- aws s3 end --> + + <dependency> + <groupId>com.azure</groupId> + <artifactId>azure-storage-blob-batch</artifactId> + <version>12.23.0</version> + </dependency> + + </dependencies> </project>
