Ian Maxon has submitted this change and it was merged. Change subject: Merge branch 'release-0.8.8' into master ......................................................................
Merge branch 'release-0.8.8' into master Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769149 --- M README.md M asterix-algebra/pom.xml M asterix-app/pom.xml D asterix-app/src/main/assembly/binary-assembly.xml M asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java D asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.1.ddl.aql D asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.2.update.aql D asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.3.query.aql D asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.4.query.aql D asterix-app/src/test/resources/metadata/results/basic/meta24/meta24.1.adm D asterix-app/src/test/resources/metadata/results/basic/meta24/meta24.2.adm M asterix-app/src/test/resources/metadata/testsuite.xml D asterix-aql/pom.xml M asterix-common/pom.xml M asterix-coverage/pom.xml M asterix-experiments/pom.xml M asterix-external-data/pom.xml M asterix-installer/pom.xml M asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java M asterix-lang-aql/pom.xml M asterix-lang-common/pom.xml M asterix-lang-sqlpp/pom.xml M asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml M asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml M asterix-metadata/pom.xml M asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java M asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java M asterix-om/pom.xml M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java M asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java M asterix-replication/pom.xml M asterix-runtime/pom.xml M asterix-tools/pom.xml M asterix-transactions/pom.xml M pom.xml 35 files changed, 194 insertions(+), 1,403 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified diff --git a/README.md b/README.md index 7fc863a..688ffea 100644 --- a/README.md +++ b/README.md @@ -16,49 +16,33 @@ ! specific language governing permissions and limitations ! under the License. !--> -#Apache AsterixDB +#AsterixDB -Apache AsterixDB is a BDMS (Big Data Management System) with a rich feature set that sets it apart from -other Big Data platforms. Its feature set makes it well-suited to modern needs such as -web data warehousing and social data storage and analysis. - -Apache AsterixDB has: +AsterixDB is a BDMS (Big Data Management System) with a rich feature set that sets it apart from other Big Data platforms. Its feature set makes it well-suited to modern needs such as web data warehousing and social data storage and analysis. AsterixDB has: * A semistructured NoSQL style data model (ADM) resulting from extending JSON with object database ideas - * An expressive and declarative query language (AQL) that supports - a broad range of queries and analysis over semistructured data + * An expressive and declarative query language (AQL) that supports a broad range of queries and analysis over semistructured data * A parallel runtime query execution engine, Hyracks, that has been scale-tested on up to 1000+ cores and 500+ disks * Partitioned LSM-based data storage and indexing to support efficient ingestion and management of semistructured data - * Support for query access to externally stored data (e.g., data in HDFS) as well - as to data stored natively by Apache AsterixDB - * A rich set of primitive data types, including spatial and temporal data in addition - to integer, floating point, and textual data + * Support for query access to externally stored data (e.g., data in HDFS) as well as to data stored natively by AsterixDB + * A rich set of primitive data types, including spatial and temporal data in addition to integer, floating point, and textual data * Secondary indexing options that include B+ trees, R trees, and inverted keyword (exact and fuzzy) index types * Support for fuzzy and spatial queries as well as for more traditional parametric queries * Basic transactional (concurrency and recovery) capabilities akin to those of a NoSQL store -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) Learn more about AsterixDB at [http://asterixdb.incubator.apache.org] (http://asterixdb.incubator.apache.org) -======= -Learn more about Apache AsterixDB at [http://asterixdb.ics.uci.edu/] (http://asterixdb.ics.uci.edu/) ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) -##Building Apache AsterixDB +##Building AsterixDB -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) To build AsterixDB from source, you should have a platform with the following: -======= -To build Apache AsterixDB from source, you should have a platform with the following: ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) * A Unix-ish environment (Linux, OS X, will all do). * git * Maven 3.1.1 or newer. * Java 8 or newer. -Additionally to run all the integration tests you should be running `sshd` locally, and have passwordless ssh -logins enabled for the account which is running the tests. +Additionally to run all the integration tests you should be running `sshd` locally, and have passwordless ssh logins enabled for the account which is running the tests. Instructions for building the master: @@ -115,22 +99,9 @@ ##Documentation -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) AsterixDB's official documentation resides at [https://ci.apache.org/projects/asterixdb/index.html] (https://ci.apache.org/projects/asterixdb/index.html). This is built from the maven project under `asterix-doc/` as a maven site. The documentation on the official website refers to the most stable build version, so for pre-release versions one should refer to the compiled documentation. -======= -Apache AsterixDB's official documentation resides at [https://ci.apache.org/projects/asterixdb/] (http://asterixdb.ics.uci.edu/documentation/index.html). -This is built from the maven project under `asterix-doc/` as a maven site. ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) ##Support/Contact -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) If you have any questions, please feel free to ask on our mailing list, [[email protected]](mailto:[email protected]). Join the list by sending an email to [[email protected]](mailto:[email protected]). If you are interested in the internals or developement of AsterixDB, also please feel free to subscribe to our developer mailing list, [[email protected]](mailto:[email protected]), by sending an email to [[email protected]](mailto:[email protected]). -======= -If you have any questions, please feel free to ask on our mailing list, [[email protected]](mailto:[email protected]). -Join the list by sending an email to [[email protected]](mailto:[email protected]). -If you are interested in the internals or developement of Apache AsterixDB, also please feel free to subscribe -to our developer mailing list, [[email protected]](mailto:[email protected]), by sending an email to [[email protected]](mailto:[email protected]). - ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) diff --git a/asterix-algebra/pom.xml b/asterix-algebra/pom.xml index 24b4115..7bc2b8c 100644 --- a/asterix-algebra/pom.xml +++ b/asterix-algebra/pom.xml @@ -10,14 +10,18 @@ License for the ! 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";> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>asterix</artifactId> + <artifactId>apache-asterixdb</artifactId> <groupId>org.apache.asterix</groupId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </parent> <artifactId>asterix-algebra</artifactId> + + <properties> + <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> + </properties> + <licenses> <license> <name>Apache License, Version 2.0</name> @@ -81,41 +85,41 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-runtime</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-aql</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-sqlpp</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-metadata</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-external-data</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-transactions</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -128,134 +132,3 @@ </dependency> </dependencies> </project> -======= - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>apache-asterixdb</artifactId> - <groupId>org.apache.asterix</groupId> - <version>0.8.9-SNAPSHOT</version> - </parent> - <artifactId>asterix-algebra</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> - - <properties> - <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>javacc</id> - <goals> - <goal>javacc</goal> - </goals> - <configuration> - <isStatic>false</isStatic> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - javacc-maven-plugin - </artifactId> - <versionRange> - [2.6,) - </versionRange> - <goals> - <goal>javacc</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-runtime</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-aql</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-metadata</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-external-data</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-transactions</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - </dependency> - </dependencies> -</project> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) diff --git a/asterix-app/pom.xml b/asterix-app/pom.xml index 01c6eea..00e924f 100644 --- a/asterix-app/pom.xml +++ b/asterix-app/pom.xml @@ -32,14 +32,11 @@ <comments>A business-friendly OSS license</comments> </license> </licenses> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= <properties> <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory> </properties> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <build> <plugins> <plugin> @@ -67,48 +64,48 @@ </executions> </plugin> <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-external-library</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>src/test/resources/externallib</outputDirectory> - <overwrite>true</overwrite> - <resources> - <resource> - <directory>../asterix-external-data/target</directory> - <includes> - <include>testlib-zip-binary-assembly.zip</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-beer-csv</id> - <phase>generate-resources</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <outputDirectory>data/csv</outputDirectory> - <overwrite>true</overwrite> - <resources> - <resource> - <directory>../asterix-external-data/src/test/resources</directory> - <includes> - <include>beer.csv</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-external-library</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>src/test/resources/externallib</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>../asterix-external-data/target</directory> + <includes> + <include>testlib-zip-binary-assembly.zip</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-beer-csv</id> + <phase>generate-resources</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>data/csv</outputDirectory> + <overwrite>true</overwrite> + <resources> + <resource> + <directory>../asterix-external-data/src/test/resources</directory> + <includes> + <include>beer.csv</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> +</plugin> </plugins> </build> <dependencies> @@ -150,72 +147,41 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-algebra</artifactId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <version>${project.version}</version> -======= - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-aql</artifactId> - <version>0.8.9-SNAPSHOT</version> - <type>jar</type> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-om</artifactId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <version>${project.version}</version> -======= - <version>0.8.9-SNAPSHOT</version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-metadata</artifactId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <version>${project.version}</version> -======= - <version>0.8.9-SNAPSHOT</version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-tools</artifactId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <version>${project.version}</version> -======= - <version>0.8.9-SNAPSHOT</version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <version>${project.version}</version> -======= - <version>0.8.9-SNAPSHOT</version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <version>${project.version}</version> -======= - <version>0.8.9-SNAPSHOT</version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <type>test-jar</type> <scope>test</scope> </dependency> @@ -225,11 +191,7 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-transactions</artifactId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <version>${project.version}</version> -======= - <version>0.8.9-SNAPSHOT</version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <scope>compile</scope> </dependency> <dependency> @@ -265,11 +227,7 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-test-framework</artifactId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <version>${project.version}</version> -======= - <version>0.8.9-SNAPSHOT</version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <scope>test</scope> </dependency> <dependency> diff --git a/asterix-app/src/main/assembly/binary-assembly.xml b/asterix-app/src/main/assembly/binary-assembly.xml deleted file mode 100644 index e75b7f6..0000000 --- a/asterix-app/src/main/assembly/binary-assembly.xml +++ /dev/null @@ -1,50 +0,0 @@ -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -<!-- - ! Licensed to the Apache Software Foundation (ASF) under one - ! or more contributor license agreements. See the NOTICE file - ! distributed with this work for additional information - ! regarding copyright ownership. The ASF licenses this file - ! to you under the Apache License, Version 2.0 (the - ! "License"); you may not use this file except in compliance - ! with the License. You may obtain a copy of the License at - ! - ! http://www.apache.org/licenses/LICENSE-2.0 - ! - ! Unless required by applicable law or agreed to in writing, - ! software distributed under the License is distributed on an - ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ! KIND, either express or implied. See the License for the - ! specific language governing permissions and limitations - ! under the License. - !--> -<assembly> - <id>binary-assembly</id> - <formats> - <format>zip</format> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <fileSets> - <fileSet> - <directory>target/appassembler/bin</directory> - <outputDirectory>bin</outputDirectory> - <fileMode>0755</fileMode> - </fileSet> - <fileSet> - <directory>target/appassembler/lib</directory> - <outputDirectory>lib</outputDirectory> - </fileSet> - </fileSets> - <dependencySets> - <dependencySet> - <outputDirectory>externallib</outputDirectory> - <includes> - <include>asterix-external-data:*:zip</include> - </includes> - <unpack>false</unpack> - <useTransitiveDependencies>false</useTransitiveDependencies> - </dependencySet> - </dependencySets> -</assembly> -======= ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) diff --git a/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java b/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java index de328f6..d3dc541 100644 --- a/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java +++ b/asterix-app/src/test/java/org/apache/asterix/test/runtime/HDFSCluster.java @@ -21,11 +21,13 @@ import java.io.File; import java.io.IOException; +import org.apache.asterix.external.dataset.adapter.GenericAdapter; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.hdfs.server.common.HdfsServerConstants.StartupOption; +import org.apache.hadoop.mapred.InputSplit; import org.apache.hadoop.mapred.JobConf; import org.apache.log4j.Level; import org.apache.log4j.Logger; @@ -69,10 +71,7 @@ conf.addResource(new Path(basePath + PATH_TO_HADOOP_CONF + "/mapred-site.xml")); conf.addResource(new Path(basePath + PATH_TO_HADOOP_CONF + "/hdfs-site.xml")); cleanupLocal(); -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) setLoggingLevel(Level.WARN); -======= ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) MiniDFSCluster.Builder build = new MiniDFSCluster.Builder(conf); build.nameNodePort(nameNodePort); build.numDataNodes(numDataNodes); @@ -82,14 +81,11 @@ loadData(basePath); } -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) private void setLoggingLevel(Level level) { Logger rootLogger = Logger.getRootLogger(); rootLogger.setLevel(level); } -======= ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) private void loadData(String localDataRoot) throws IOException { Path destDir = new Path(HDFS_PATH); dfs.mkdirs(destDir); @@ -113,10 +109,7 @@ dfsCluster.shutdown(); cleanupLocal(); } -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= } - public static void main(String[] args) throws Exception { HDFSCluster cluster = new HDFSCluster(); cluster.setup(); @@ -133,11 +126,10 @@ String hdfsPath = "/asterix/extrasmalltweets.txt"; conf.set("fs.default.name", hdfsUrl); conf.set("fs.hdfs.impl", "org.apache.hadoop.hdfs.DistributedFileSystem"); - conf.setClassLoader(HDFSAdapter.class.getClassLoader()); + conf.setClassLoader(GenericAdapter.class.getClassLoader()); conf.set("mapred.input.dir", hdfsPath); conf.set("mapred.input.format.class", "org.apache.hadoop.mapred.TextInputFormat"); return conf; ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) } } diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.1.ddl.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.1.ddl.aql deleted file mode 100644 index 7ae4adb..0000000 --- a/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.1.ddl.aql +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Create primary index & secondary index on open union field & query Metadata dataset to verify. - * Expected Res : Success - * Date : 30 Sep 2013 - */ - -drop dataverse testdv if exists; -create dataverse testdv; - -create type testdv.testtype as open { -id : int32 -} - -create dataset testdv.t1(testtype) primary key id; - -create index idx1 on testdv.t1(name: string) type btree enforced; diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.2.update.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.2.update.aql deleted file mode 100644 index 042f3ce..0000000 --- a/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.2.update.aql +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.3.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.3.query.aql deleted file mode 100644 index e8ca427..0000000 --- a/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.3.query.aql +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Create primary index & secondary index on open union field & query Metadata dataset to verify. - * Expected Res : Success - * Date : 30 Sep 2013 - */ - -for $l in dataset('Metadata.Index') -where $l.DataverseName='testdv' -return $l.SearchKeyType - diff --git a/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.4.query.aql b/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.4.query.aql deleted file mode 100644 index 774ff28..0000000 --- a/asterix-app/src/test/resources/metadata/queries/basic/meta24/meta24.4.query.aql +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -/* - * Description : Create primary index & secondary index on open union field & query Metadata dataset to verify. - * Expected Res : Success - * Date : 30 Sep 2013 - */ - -for $l in dataset('Metadata.Index') -where $l.DataverseName='testdv' -return $l.IsEnforced - diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta24/meta24.1.adm b/asterix-app/src/test/resources/metadata/results/basic/meta24/meta24.1.adm deleted file mode 100644 index 75bf2df..0000000 --- a/asterix-app/src/test/resources/metadata/results/basic/meta24/meta24.1.adm +++ /dev/null @@ -1,3 +0,0 @@ -[ [ "string" ] -, null - ] \ No newline at end of file diff --git a/asterix-app/src/test/resources/metadata/results/basic/meta24/meta24.2.adm b/asterix-app/src/test/resources/metadata/results/basic/meta24/meta24.2.adm deleted file mode 100644 index 43df3ea..0000000 --- a/asterix-app/src/test/resources/metadata/results/basic/meta24/meta24.2.adm +++ /dev/null @@ -1,3 +0,0 @@ -[ true -, null - ] \ No newline at end of file diff --git a/asterix-app/src/test/resources/metadata/testsuite.xml b/asterix-app/src/test/resources/metadata/testsuite.xml index fa61ab8..595eb84 100644 --- a/asterix-app/src/test/resources/metadata/testsuite.xml +++ b/asterix-app/src/test/resources/metadata/testsuite.xml @@ -209,21 +209,6 @@ </compilation-unit> </test-case> <test-case FilePath="basic"> - <compilation-unit name="meta22"> - <output-dir compare="Text">meta22</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="basic"> - <compilation-unit name="meta23"> - <output-dir compare="Text">meta23</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="basic"> - <compilation-unit name="meta24"> - <output-dir compare="Text">meta24</output-dir> - </compilation-unit> - </test-case> - <test-case FilePath="basic"> <compilation-unit name="metadata_compaction_policy"> <output-dir compare="Text">metadata_compaction_policy</output-dir> </compilation-unit> diff --git a/asterix-aql/pom.xml b/asterix-aql/pom.xml deleted file mode 100644 index 42a6a4d..0000000 --- a/asterix-aql/pom.xml +++ /dev/null @@ -1,165 +0,0 @@ -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= -<!-- - ! Licensed to the Apache Software Foundation (ASF) under one - ! or more contributor license agreements. See the NOTICE file - ! distributed with this work for additional information - ! regarding copyright ownership. The ASF licenses this file - ! to you under the Apache License, Version 2.0 (the - ! "License"); you may not use this file except in compliance - ! with the License. You may obtain a copy of the License at - ! - ! http://www.apache.org/licenses/LICENSE-2.0 - ! - ! Unless required by applicable law or agreed to in writing, - ! software distributed under the License is distributed on an - ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - ! KIND, either express or implied. See the License for the - ! 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.8.9-SNAPSHOT</version> - </parent> - - <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> - <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> - </properties> - - <artifactId>asterix-aql</artifactId> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>javacc-maven-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>javacc</id> - <goals> - <goal>javacc</goal> - </goals> - <configuration> - <isStatic>false</isStatic> - <javaUnicodeEscape>true</javaUnicodeEscape> - </configuration> - </execution> - <execution> - <id>javacc-jjdoc</id> - <goals> - <goal>jjdoc</goal> - </goals> - <phase>process-sources</phase> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.9</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${project.build.directory}/generated-sources/javacc/</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings - only. It has no influence on the Maven build itself. --> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - javacc-maven-plugin - </artifactId> - <versionRange> - [2.6,) - </versionRange> - <goals> - <goal>jjdoc</goal> - <goal>javacc</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-common</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-om</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-metadata</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xerces</artifactId> - <version>2.4.0</version> - </dependency> - </dependencies> - -</project> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) diff --git a/asterix-common/pom.xml b/asterix-common/pom.xml index ea6ed0c..2ab8b91 100644 --- a/asterix-common/pom.xml +++ b/asterix-common/pom.xml @@ -33,13 +33,10 @@ <comments>A business-friendly OSS license</comments> </license> </licenses> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= <properties> <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> </properties> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <build> <plugins> diff --git a/asterix-coverage/pom.xml b/asterix-coverage/pom.xml index 3f77ed8..6cc00d3 100644 --- a/asterix-coverage/pom.xml +++ b/asterix-coverage/pom.xml @@ -25,8 +25,8 @@ <parent> <groupId>org.apache.asterix</groupId> - <artifactId>asterix</artifactId> - <version>0.8.8-SNAPSHOT</version> + <artifactId>apache-asterixdb</artifactId> + <version>0.8.9-SNAPSHOT</version> </parent> <build> diff --git a/asterix-experiments/pom.xml b/asterix-experiments/pom.xml index 9ed9324..56be6f1 100644 --- a/asterix-experiments/pom.xml +++ b/asterix-experiments/pom.xml @@ -15,9 +15,9 @@ <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>asterix</artifactId> + <artifactId>apache-asterixdb</artifactId> <groupId>org.apache.asterix</groupId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </parent> <artifactId>asterix-experiments</artifactId> @@ -92,31 +92,31 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-aql</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-algebra</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-external-data</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-metadata</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -148,7 +148,7 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-app</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> <!-- <dependency> <groupId>net.schmizz</groupId> diff --git a/asterix-external-data/pom.xml b/asterix-external-data/pom.xml index a00f73c..9a8540f 100644 --- a/asterix-external-data/pom.xml +++ b/asterix-external-data/pom.xml @@ -17,12 +17,11 @@ ! 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";> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>asterix</artifactId> + <artifactId>apache-asterixdb</artifactId> <groupId>org.apache.asterix</groupId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </parent> <licenses> <license> @@ -33,12 +32,15 @@ </license> </licenses> <artifactId>asterix-external-data</artifactId> + <properties> + <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> + </properties> <build> <plugins> <plugin> <groupId>org.apache.asterix</groupId> <artifactId>lexer-generator-maven-plugin</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <configuration> <grammarFile>src/main/resources/adm.grammar</grammarFile> <outputDir>${project.build.directory}/generated-sources/org/apache/asterix/runtime/operators/file/adm</outputDir> @@ -93,41 +95,45 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <configuration> - <includes> - <include>**/*.class</include> - <include>**/*.txt</include> - </includes> - </configuration> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <executions> - <execution> - <configuration> - <descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor> - <finalName>testlib-zip</finalName> - </configuration> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.4</version> + <configuration> + <includes> + <include>**/*.class</include> + <include>**/*.txt</include> + <include>**/DISCLAIMER</include> + <include>**/NOTICE</include> + <include>**/LICENSE</include> + <include>**/DEPENDENCIES</include> + </includes> + </configuration> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-5</version> + <executions> + <execution> + <configuration> + <descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor> + <finalName>testlib-zip</finalName> + </configuration> + <phase>package</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> <pluginManagement> <plugins> @@ -183,14 +189,14 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-om</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-runtime</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> @@ -210,152 +216,10 @@ <version>[4.0,)</version> </dependency> <dependency> -======= - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>apache-asterixdb</artifactId> - <groupId>org.apache.asterix</groupId> - <version>0.8.9-SNAPSHOT</version> - </parent> - - <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> - - <artifactId>asterix-external-data</artifactId> - - <properties> - <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> - <groupId>org.jvnet.jaxb2.maven2</groupId> - <artifactId>maven-jaxb2-plugin</artifactId> - <version>0.9.0</version> - <executions> - <execution> - <id>configuration</id> - <goals> - <goal>generate</goal> - </goals> - <configuration> - <schemaDirectory>src/main/resources/schema</schemaDirectory> - <schemaIncludes> - <include>library.xsd</include> - </schemaIncludes> - <generatePackage>org.apache.asterix.external.library</generatePackage> - <generateDirectory>${project.build.directory}/generated-sources/configuration</generateDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <configuration> - <includes> - <include>**/*.class</include> - <include>**/*.txt</include> - <include>**/DISCLAIMER</include> - <include>**/NOTICE</include> - <include>**/LICENSE</include> - <include>**/DEPENDENCIES</include> - </includes> - </configuration> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - <phase>package</phase> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-5</version> - <executions> - <execution> - <configuration> - <descriptor>src/main/assembly/binary-assembly-libzip.xml</descriptor> - <finalName>testlib-zip</finalName> - </configuration> - <phase>package</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <type>jar</type> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-om</artifactId> - <version>0.8.9-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-runtime</artifactId> - <version>0.8.9-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-metadata</artifactId> - <version>0.8.9-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>algebricks-compiler</artifactId> - </dependency> - <dependency> - <groupId>com.kenai.nbpwr</groupId> - <artifactId>org-apache-commons-io</artifactId> - <version>1.3.1-201002241208</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.twitter4j</groupId> - <artifactId>twitter4j-core</artifactId> - <version>[3.0,)</version> - </dependency> - <dependency> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <groupId>org.twitter4j</groupId> <artifactId>twitter4j-stream</artifactId> <version>[4.0,)</version> </dependency> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> @@ -397,7 +261,7 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> <dependency> <groupId>com.microsoft.windowsazure</groupId> @@ -432,61 +296,3 @@ </dependency> </dependencies> </project> -======= - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>net.java.dev.rome</groupId> - <artifactId>rome-fetcher</artifactId> - <version>1.0.0</version> - <type>jar</type> - <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>rome</artifactId> - <groupId>net.java.dev.rome</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>1.0.1-modified-01</version> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-hdfs-core</artifactId> - <version>${hyracks.version}</version> - </dependency> - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-common</artifactId> - <version>0.8.9-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>com.microsoft.windowsazure</groupId> - <artifactId>microsoft-windowsazure-api</artifactId> - <version>0.4.4</version> - </dependency> - <dependency> - <groupId>org.apache.hive</groupId> - <artifactId>hive-exec</artifactId> - <version>0.13.0</version> - </dependency> - <dependency> - <groupId>javax.jdo</groupId> - <artifactId>jdo2-api</artifactId> - <version>2.3-20090302111651</version> - </dependency> - </dependencies> -</project> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) diff --git a/asterix-installer/pom.xml b/asterix-installer/pom.xml index bc0a5d4..712d350 100644 --- a/asterix-installer/pom.xml +++ b/asterix-installer/pom.xml @@ -28,13 +28,10 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <failsafe.test.excludes>**/DmlRecoveryIT.java</failsafe.test.excludes> <cluster.test.excludes>**/AsterixClusterLifeCycleIT.java</cluster.test.excludes> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <cluster.extest.excludes>**/ClusterExecutionIT.java</cluster.extest.excludes> <replication.test.excludes>**/ReplicationIT.java</replication.test.excludes> <jacocoArgLine/> -======= <appendedResourcesDirectory>${basedir}/src/main/appended-resources</appendedResourcesDirectory> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) </properties> <licenses> @@ -274,7 +271,7 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-app</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java b/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java index a93227f..5fe09d0 100644 --- a/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java +++ b/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java @@ -34,14 +34,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= -import org.apache.asterix.test.aql.TestsUtils; import org.apache.asterix.test.runtime.HDFSCluster; import org.apache.asterix.testframework.context.TestCaseContext; ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) - @RunWith(Parameterized.class) public class RecoveryIT { @@ -83,18 +78,11 @@ + "resources" + File.separator + "transactionts" + File.separator + "scripts"; env.put("SCRIPT_HOME", scriptHomePath); -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "setup_teardown" + File.separator + "configure_and_validate.sh"); - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "setup_teardown" + File.separator + "stop_and_delete.sh"); -======= - TestsUtils.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + TestExecutor.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + "configure_and_validate.sh"); - TestsUtils.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + TestExecutor.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + "stop_and_delete.sh"); HDFSCluster.getInstance().setup(HDFS_BASE); ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) } @AfterClass @@ -104,18 +92,11 @@ File dataCopyDir = new File( managixHomePath + File.separator + ".." + File.separator + ".." + File.separator + "data"); FileUtils.deleteDirectory(dataCopyDir); -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "setup_teardown" + File.separator + "stop_and_delete.sh"); - TestExecutor.executeScript(pb, - scriptHomePath + File.separator + "setup_teardown" + File.separator + "shutdown.sh"); -======= - TestsUtils.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + TestExecutor.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + "stop_and_delete.sh"); - TestsUtils.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + TestExecutor.executeScript(pb, scriptHomePath + File.separator + "setup_teardown" + File.separator + "shutdown.sh"); HDFSCluster.getInstance().cleanup(); ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) } @Parameters diff --git a/asterix-lang-aql/pom.xml b/asterix-lang-aql/pom.xml index b8ea8c3..43ac3df 100644 --- a/asterix-lang-aql/pom.xml +++ b/asterix-lang-aql/pom.xml @@ -22,9 +22,9 @@ 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>asterix</artifactId> + <artifactId>apache-asterixdb</artifactId> <groupId>org.apache.asterix</groupId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </parent> <licenses> @@ -37,17 +37,11 @@ </licenses> <artifactId>asterix-lang-aql</artifactId> + <properties> + <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> + </properties> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - <fork>true</fork> - </configuration> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> @@ -135,7 +129,7 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> </dependencies> diff --git a/asterix-lang-common/pom.xml b/asterix-lang-common/pom.xml index 1e22da0..d1a5f80 100644 --- a/asterix-lang-common/pom.xml +++ b/asterix-lang-common/pom.xml @@ -22,9 +22,9 @@ 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>asterix</artifactId> + <artifactId>apache-asterixdb</artifactId> <groupId>org.apache.asterix</groupId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </parent> <licenses> @@ -39,15 +39,6 @@ <artifactId>asterix-lang-common</artifactId> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - <fork>true</fork> - </configuration> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> @@ -74,13 +65,13 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-metadata</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -90,4 +81,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/asterix-lang-sqlpp/pom.xml b/asterix-lang-sqlpp/pom.xml index 492bcf1..d69538e 100644 --- a/asterix-lang-sqlpp/pom.xml +++ b/asterix-lang-sqlpp/pom.xml @@ -22,9 +22,9 @@ 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>asterix</artifactId> + <artifactId>apache-asterixdb</artifactId> <groupId>org.apache.asterix</groupId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </parent> <licenses> @@ -39,15 +39,6 @@ <artifactId>asterix-lang-sqlpp</artifactId> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - <fork>true</fork> - </configuration> - </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>javacc-maven-plugin</artifactId> @@ -135,8 +126,8 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml index af3a744..9fe2e44 100644 --- a/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml +++ b/asterix-maven-plugins/lexer-generator-maven-plugin/pom.xml @@ -29,28 +29,9 @@ <packaging>maven-plugin</packaging> <name>lexer-generator-maven-plugin</name> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= <properties> <appendedResourcesDirectory>${basedir}/../../src/main/appended-resources</appendedResourcesDirectory> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> - ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <dependencies> <dependency> <groupId>junit</groupId> diff --git a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml index 5103614..eee8438 100644 --- a/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml +++ b/asterix-maven-plugins/record-manager-generator-maven-plugin/pom.xml @@ -29,28 +29,9 @@ <packaging>maven-plugin</packaging> <name>record-manager-generator-maven-plugin</name> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= <properties> <appendedResourcesDirectory>${basedir}/../../src/main/appended-resources</appendedResourcesDirectory> </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> - ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <dependencies> <dependency> <groupId>org.apache.maven</groupId> diff --git a/asterix-metadata/pom.xml b/asterix-metadata/pom.xml index ca04ee3..d1f294c 100644 --- a/asterix-metadata/pom.xml +++ b/asterix-metadata/pom.xml @@ -17,14 +17,16 @@ ! 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";> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>asterix</artifactId> + <artifactId>apache-asterixdb</artifactId> <groupId>org.apache.asterix</groupId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </parent> <artifactId>asterix-metadata</artifactId> + <properties> + <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> + </properties> <licenses> <license> <name>Apache License, Version 2.0</name> @@ -37,25 +39,25 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-om</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-runtime</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-events</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -84,95 +86,7 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-external-data</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> </dependencies> </project> -======= - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>apache-asterixdb</artifactId> - <groupId>org.apache.asterix</groupId> - <version>0.8.9-SNAPSHOT</version> - </parent> - <artifactId>asterix-metadata</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> - - <properties> - <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-common</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-om</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-runtime</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-events</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-btree</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-lsm-rtree</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-hdfs-core</artifactId> - <version>${hyracks.version}</version> - </dependency> - </dependencies> -</project> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java index f453058..90bec64 100644 --- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java +++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java @@ -799,25 +799,21 @@ } for (int j = 0; j < pidxKeyFieldCount; ++j, ++i) { -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) - IAType keyType = recType.getSubFieldType(pidxKeyFieldNames.get(j)); -======= - IAType keyType = null; - try { - switch (dsType) { - case INTERNAL: - keyType = recType.getSubFieldType(pidxKeyFieldNames.get(j)); - break; - case EXTERNAL: - keyType = IndexingConstants.getFieldType(j); - break; - default: - throw new AlgebricksException("Unknown Dataset Type"); - } - } catch (IOException| AsterixException e) { - throw new AlgebricksException(e); - } ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) + IAType keyType = null; + try { + switch (dsType) { + case INTERNAL: + keyType = recType.getSubFieldType(pidxKeyFieldNames.get(j)); + break; + case EXTERNAL: + keyType = IndexingConstants.getFieldType(j); + break; + default: + throw new AlgebricksException("Unknown Dataset Type"); + } + } catch (AsterixException e) { + throw new AlgebricksException(e); + } comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(keyType, true); typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType); diff --git a/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java b/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java index 7d9f094..3508554 100644 --- a/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java +++ b/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java @@ -148,11 +148,8 @@ ArrayBackedValueStorage itemValue = new ArrayBackedValueStorage(); OrderedListBuilder primaryKeyListBuilder = new OrderedListBuilder(); AOrderedListType stringList = new AOrderedListType(BuiltinType.ASTRING, null); -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) AOrderedListType int8List = new AOrderedListType(BuiltinType.AINT8, null); -======= AOrderedListType heterogeneousList = new AOrderedListType(BuiltinType.ANY, null); ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) internalRecordBuilder.reset(MetadataRecordTypes.INTERNAL_DETAILS_RECORDTYPE); AMutableString aString = new AMutableString(""); AMutableInt8 aInt8 = new AMutableInt8((byte) 0); diff --git a/asterix-om/pom.xml b/asterix-om/pom.xml index 8f4e7b2..48e4ffd 100644 --- a/asterix-om/pom.xml +++ b/asterix-om/pom.xml @@ -34,28 +34,10 @@ </license> </licenses> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </build> - <properties> <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> </properties> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <dependencies> <dependency> <groupId>org.apache.asterix</groupId> diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java index 829974a..364b2d6 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java @@ -68,22 +68,6 @@ public AOrderedList deserialize(DataInput in) throws HyracksDataException { try { ATypeTag typeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(in.readByte()); -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= - switch (typeTag) { - case STRING: - case BINARY: - case RECORD: - case ORDEREDLIST: - case UNORDEREDLIST: - case ANY: - fixedSize = false; - break; - default: - fixedSize = true; - break; - } ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) IAType currentItemType = itemType; @SuppressWarnings("rawtypes") diff --git a/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java b/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java index a7bb79d..620b9ae 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/types/BuiltinType.java @@ -732,37 +732,6 @@ @Override public String getTypeName() { return "uuid"; -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= - } - - @Override - public JSONObject toJSON() throws JSONException { - JSONObject type = new JSONObject(); - type.put("type", getDisplayName()); - return type; - } - }; - - // AUUID_STRING is used when converting between the string representation of - // UUID and corresponding a UUID instance - public static final BuiltinType AUUID_STRING = new LowerCaseConstructorType() { - private static final long serialVersionUID = 1L; - - @Override - public ATypeTag getTypeTag() { - return ATypeTag.UUID_STRING; - } - - @Override - public String getDisplayName() { - return "UUID_STRING"; - } - - @Override - public String getTypeName() { - return "uuid_string"; ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) } @Override diff --git a/asterix-replication/pom.xml b/asterix-replication/pom.xml index b5595ef..5086192 100644 --- a/asterix-replication/pom.xml +++ b/asterix-replication/pom.xml @@ -3,8 +3,8 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.asterix</groupId> - <artifactId>asterix</artifactId> - <version>0.8.8-SNAPSHOT</version> + <artifactId>apache-asterixdb</artifactId> + <version>0.8.9-SNAPSHOT</version> </parent> <artifactId>asterix-replication</artifactId> <licenses> @@ -17,15 +17,6 @@ </licenses> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.8</source> - <target>1.8</target> - <fork>true</fork> - </configuration> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> @@ -50,12 +41,12 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-metadata</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -67,4 +58,4 @@ </dependency> </dependencies> -</project> \ No newline at end of file +</project> diff --git a/asterix-runtime/pom.xml b/asterix-runtime/pom.xml index e02f717..6414139 100644 --- a/asterix-runtime/pom.xml +++ b/asterix-runtime/pom.xml @@ -17,14 +17,16 @@ ! 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";> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>asterix</artifactId> + <artifactId>apache-asterixdb</artifactId> <groupId>org.apache.asterix</groupId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> </parent> <artifactId>asterix-runtime</artifactId> + <properties> + <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> + </properties> <licenses> <license> <name>Apache License, Version 2.0</name> @@ -37,13 +39,13 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-om</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-fuzzyjoin</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -53,7 +55,7 @@ <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-transactions</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <scope>compile</scope> </dependency> <dependency> @@ -78,177 +80,3 @@ </dependency> </dependencies> </project> -======= - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>apache-asterixdb</artifactId> - <groupId>org.apache.asterix</groupId> - <version>0.8.9-SNAPSHOT</version> - </parent> - <artifactId>asterix-runtime</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> - - - <properties> - <appendedResourcesDirectory>${basedir}/../src/main/appended-resources</appendedResourcesDirectory> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.asterix</groupId> - <artifactId>lexer-generator-maven-plugin</artifactId> - <version>0.8.9-SNAPSHOT</version> - <configuration> - <grammarFile>src/main/resources/adm.grammar</grammarFile> - <outputDir>${project.build.directory}/generated-sources/org/apache/asterix/runtime/operators/file/adm</outputDir> - </configuration> - <executions> - <execution> - <id>generate-lexer</id> - <phase>generate-sources</phase> - <goals> - <goal>generate-lexer</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.9</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${project.build.directory}/generated-sources/</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - <pluginManagement> - <plugins> - <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.--> - <plugin> - <groupId>org.eclipse.m2e</groupId> - <artifactId>lifecycle-mapping</artifactId> - <version>1.0.0</version> - <configuration> - <lifecycleMappingMetadata> - <pluginExecutions> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.apache.asterix - </groupId> - <artifactId> - lexer-generator-maven-plugin - </artifactId> - <versionRange> - [0.1,) - </versionRange> - <goals> - <goal>generate-lexer</goal> - </goals> - </pluginExecutionFilter> - <action> - <execute> - <runOnIncremental>false</runOnIncremental> - </execute> - </action> - </pluginExecution> - <pluginExecution> - <pluginExecutionFilter> - <groupId> - org.codehaus.mojo - </groupId> - <artifactId> - build-helper-maven-plugin - </artifactId> - <versionRange> - [1.7,) - </versionRange> - <goals> - <goal>add-source</goal> - </goals> - </pluginExecutionFilter> - <action> - <ignore /> - </action> - </pluginExecution> - </pluginExecutions> - </lifecycleMappingMetadata> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-om</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-fuzzyjoin</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-storage-am-btree</artifactId> - </dependency> - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-transactions</artifactId> - <version>0.8.9-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.twitter4j</groupId> - <artifactId>twitter4j-core</artifactId> - <version>2.2.3</version> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <type>jar</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-api</artifactId> - </dependency> - </dependencies> - -</project> - ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) diff --git a/asterix-tools/pom.xml b/asterix-tools/pom.xml index 14644ee..ac377a8 100644 --- a/asterix-tools/pom.xml +++ b/asterix-tools/pom.xml @@ -41,20 +41,7 @@ <build> <plugins> <plugin> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) -======= <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - <fork>true</fork> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <artifactId>maven-jar-plugin</artifactId> <version>2.4</version> <configuration> @@ -103,13 +90,8 @@ <dependencies> <dependency> <groupId>org.apache.asterix</groupId> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <artifactId>asterix-lang-aql</artifactId> - <version>0.8.8-SNAPSHOT</version> -======= - <artifactId>asterix-aql</artifactId> <version>0.8.9-SNAPSHOT</version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) <scope>compile</scope> </dependency> <dependency> diff --git a/asterix-transactions/pom.xml b/asterix-transactions/pom.xml index 70c3f61..cc3f41f 100644 --- a/asterix-transactions/pom.xml +++ b/asterix-transactions/pom.xml @@ -90,24 +90,27 @@ <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-common</artifactId> + <version>${hyracks.version}</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-btree</artifactId> + <version>${hyracks.version}</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-rtree</artifactId> + <version>${hyracks.version}</version> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> + <version>${hyracks.version}</version> </dependency> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-common</artifactId> - <version>0.8.8-SNAPSHOT</version> + <version>0.8.9-SNAPSHOT</version> <type>jar</type> <scope>compile</scope> </dependency> @@ -122,15 +125,5 @@ <version>1.10.19</version> </dependency> </dependencies> -======= - <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-common</artifactId> - <version>0.8.9-SNAPSHOT</version> - <type>jar</type> - <scope>compile</scope> - </dependency> - </dependencies> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) </project> diff --git a/pom.xml b/pom.xml index b15e830..dcabb5b 100644 --- a/pom.xml +++ b/pom.xml @@ -54,16 +54,9 @@ <invalid.tests>**/DmlTest.java</invalid.tests> <global.test.includes>**/*TestSuite.java,**/*Test.java,${execution.tests}</global.test.includes> <global.test.excludes>${optimizer.tests},${metadata.tests},${invalid.tests},${repeated.tests}</global.test.excludes> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) - - <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.2.17-SNAPSHOT</algebricks.version> - <hyracks.version>0.2.17-SNAPSHOT</hyracks.version> -======= <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.2.17-incubating</algebricks.version> - <hyracks.version>0.2.17-incubating</hyracks.version> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) + <algebricks.version>0.2.18-SNAPSHOT</algebricks.version> + <hyracks.version>0.2.18-SNAPSHOT</hyracks.version> <hadoop.version>2.2.0</hadoop.version> <junit.version>4.11</junit.version> <commons.io.version>2.4</commons.io.version> @@ -93,7 +86,7 @@ -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n ${coverageArgLine} - </argLine> + </argLine> <includes> <include>${global.test.includes},${test.includes}</include> </includes> @@ -194,9 +187,6 @@ </configuration> </plugin> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) - <!-- END OF GIT COMMIT ID PLUGIN CONFIGURATION --> -======= <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-remote-resources-plugin</artifactId> @@ -219,7 +209,6 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> </plugin> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) </plugins> <pluginManagement> <plugins> @@ -282,8 +271,9 @@ <connection>scm:git:https://github.com/apache/incubator-asterixdb</connection> <developerConnection>scm:git:ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb</developerConnection> <url>https://github.com/apache/incubator-asterixdb</url> - <tag>HEAD</tag> - </scm> + + <tag>HEAD</tag> + </scm> <profiles> <profile> @@ -341,7 +331,6 @@ <test.heap.size>3072</test.heap.size> </properties> </profile> -<<<<<<< HEAD (22ad8e ASTERIXDB-865: fix query compilation for if-else expression.) <profile> <id>asterix-release</id> <build> @@ -383,7 +372,6 @@ <jdk.version>1.8</jdk.version> </properties> </profile> - <!-- Code Coverage --> <profile> <id>coverage</id> <activation> @@ -425,8 +413,7 @@ <properties> <coverageArgLine/> </properties> -======= - + </profile> <profile> <id>doclint-java8-disable</id> <activation> @@ -444,7 +431,6 @@ </plugin> </plugins> </build> ->>>>>>> BRANCH (601efe Revert "ASTERIXDB-1109: Fixed deletion of records from open ) </profile> </profiles> -- To view, visit https://asterix-gerrit.ics.uci.edu/701 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8fcf41c009f9faf51bc8bccc0c3c7217b7769149 Gerrit-PatchSet: 31 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Chris Hillery <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
