Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5FA8D200B83 for ; Sun, 7 Aug 2016 07:35:36 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5C611160A89; Sun, 7 Aug 2016 05:35:36 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D1511160AAD for ; Sun, 7 Aug 2016 07:35:34 +0200 (CEST) Received: (qmail 59504 invoked by uid 500); 7 Aug 2016 05:35:34 -0000 Mailing-List: contact commits-help@quickstep.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@quickstep.incubator.apache.org Delivered-To: mailing list commits@quickstep.incubator.apache.org Received: (qmail 59494 invoked by uid 99); 7 Aug 2016 05:35:34 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Aug 2016 05:35:34 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 887751862AE for ; Sun, 7 Aug 2016 05:35:33 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id bKSGyc-h-c-A for ; Sun, 7 Aug 2016 05:35:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id 5929560E3F for ; Sun, 7 Aug 2016 05:35:10 +0000 (UTC) Received: (qmail 58791 invoked by uid 99); 7 Aug 2016 05:35:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Aug 2016 05:35:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D8C34EEE1D; Sun, 7 Aug 2016 05:35:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zuyuz@apache.org To: commits@quickstep.incubator.apache.org Date: Sun, 07 Aug 2016 05:35:35 -0000 Message-Id: In-Reply-To: <8b3ec5c03fe740a8ab03a1a2e49077cd@git.apache.org> References: <8b3ec5c03fe740a8ab03a1a2e49077cd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/28] incubator-quickstep git commit: Additional fixes. archived-at: Sun, 07 Aug 2016 05:35:36 -0000 Additional fixes. Project: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/commit/07419275 Tree: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/tree/07419275 Diff: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/diff/07419275 Branch: refs/heads/change-cn Commit: 07419275ebd61081a4ca9e92354ca34c114ca725 Parents: 6f035d7 Author: Zuyu Zhang Authored: Sat Aug 6 22:33:23 2016 -0700 Committer: Zuyu Zhang Committed: Sat Aug 6 22:34:16 2016 -0700 ---------------------------------------------------------------------- CMakeLists.txt | 12 ++++----- GENERATOR_FUNCTIONS.md | 6 ++--- NOTICE | 2 +- README.md | 18 +++++++------- WORKING_WITH_AN_IDE.md | 18 +++++++------- catalog/CMakeLists.txt | 2 -- catalog/Catalog.proto | 2 +- cli/CMakeLists.txt | 2 -- cli/tests/CMakeLists.txt | 2 +- expressions/aggregation/AggregateFunction.hpp | 2 +- .../WindowAggregateFunction.hpp | 4 +-- .../WindowAggregateFunction.proto | 2 +- parser/CMakeLists.txt | 2 -- parser/ParseSimpleTableReference.hpp | 4 +-- parser/ParseWindow.hpp | 2 +- parser/SqlParser.ypp | 6 ++--- parser/tests/Index.test | 1 - parser/tests/Select.test | 10 +++----- parser/tests/TPCH.test | 2 -- query_execution/CMakeLists.txt | 2 -- query_execution/QueryExecutionMessages.proto | 4 +-- query_optimizer/CMakeLists.txt | 2 -- query_optimizer/cost_model/CMakeLists.txt | 2 -- query_optimizer/expressions/CMakeLists.txt | 2 -- query_optimizer/logical/CMakeLists.txt | 4 +-- query_optimizer/logical/Sample.hpp | 4 +-- query_optimizer/physical/Sample.hpp | 4 +-- query_optimizer/resolver/CMakeLists.txt | 2 -- query_optimizer/resolver/Resolver.hpp | 2 +- query_optimizer/rules/CMakeLists.txt | 2 -- query_optimizer/strategy/CMakeLists.txt | 2 -- .../tests/execution_generator/Select.test | 2 -- .../tests/logical_generator/Select.test | 2 -- .../tests/physical_generator/Select.test | 2 -- query_optimizer/tests/resolver/Select.test | 2 -- relational_operators/CMakeLists.txt | 4 +-- storage/CMakeLists.txt | 2 -- storage/EvictionPolicy.cpp | 6 ++--- storage/HashTableKeyManager.hpp | 2 +- storage/StorageBlockLayout.proto | 2 +- storage/WindowAggregationOperationState.hpp | 2 +- third_party/README.md | 4 +-- third_party/glog/CMakeLists.txt | 21 +++++++++++++--- third_party/protobuf_cmake/CMakeLists.txt | 26 +++++++++++--------- types/operations/Operation.proto | 2 +- .../operations/binary_operations/CMakeLists.txt | 2 -- types/operations/comparisons/ComparisonID.hpp | 6 ++--- .../operations/unary_operations/CMakeLists.txt | 2 -- 48 files changed, 95 insertions(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f07c43..487aaf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -283,13 +283,11 @@ else() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") endif() - if (ENABLE_DISTRIBUTED) - # Clang reports such warning when using Protoc 3.0 beta. - if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") - CHECK_CXX_COMPILER_FLAG("-Wno-extended-offsetof" COMPILER_HAS_WNO_EXTENDED_OFFSETOF) - if (COMPILER_HAS_WNO_EXTENDED_OFFSETOF) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof") - endif() + # Clang reports such warning when using Protoc 3.0 beta. + if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") + CHECK_CXX_COMPILER_FLAG("-Wno-extended-offsetof" COMPILER_HAS_WNO_EXTENDED_OFFSETOF) + if (COMPILER_HAS_WNO_EXTENDED_OFFSETOF) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-extended-offsetof") endif() endif() http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/GENERATOR_FUNCTIONS.md ---------------------------------------------------------------------- diff --git a/GENERATOR_FUNCTIONS.md b/GENERATOR_FUNCTIONS.md index 89f6909..78b4079 100644 --- a/GENERATOR_FUNCTIONS.md +++ b/GENERATOR_FUNCTIONS.md @@ -65,12 +65,12 @@ It is a theta-join between two generated relations. The output will be: 4. At the final stage of query planning, the physical plan node is transformed into a relational operator. - *See `TableGeneratorOperator` as the relational operator class that represents a operator that will produce run-time work orders.* - + 5. At the time of query execution, the function handle's `populateColumns()` method is invoked to actually generate a relation. - *See `TableGeneratorWorkOrder` as the work order class that actually invokes the generator function to populate a relation at run time.* - + ##Implement a new generator function -There are just three steps to implement a new generator function. +There are just three steps to implement a new generator function. 1. Subclass **`GeneratorFunctionHandle`** and implement all virtual methods. - *See `GenerateSeriesHandle` as an example.* http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/NOTICE ---------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 32db8b8..3ead237 100644 --- a/NOTICE +++ b/NOTICE @@ -25,7 +25,7 @@ Portions Copyright (c) Shuo Chen Portions Copyright (c) Yusuke Suzuki [Copyright for third_party/cpplint] -Portions Copyright (c) 2009 Google Inc +Portions Copyright (c) 2009 Google Inc [Copyright for third_party/farmhash] Copyright (c) 2014 Google, Inc. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index bf9ed8d..af17264 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ ## What is Quickstep? Apache Quickstep is high-performance database engine designed to exploit the full potential of hardware that is packed in modern computing boxes (servers and laptops). The initial version (available now!) targets single-node in-memory environments. If your data spills overs the memory limit Quickstep will still work, so you don't have to obsessively worry about the in-memory part. Also, if your working set fits in memory then Quickstep will transparently and automatically figure that out, and cache that hot set to deliver in-memory performance. -Distributed execution is the next big feature for Quickstep. +Distributed execution is the next big feature for Quickstep. Quickstep began life in 2011 as a [research project at the University of Wisconsin](https://www.cs.wisc.edu/~jignesh) @@ -39,13 +39,13 @@ And, it is **open source!** 3. Initialize the dependencies: ```git submodule init``` 4. Checkout the dependencies: ```git submodule update``` 5. Go into the build directory: ```cd build``` -6. Create the Makefile: ```cmake -D CMAKE_BUILD_TYPE=Release ..``` -7. Build: ```make -j4```. Note you may replace the 4 with the number of cores +6. Create the Makefile: ```cmake -D CMAKE_BUILD_TYPE=Release ..``` +7. Build: ```make -j4```. Note you may replace the 4 with the number of cores on your machine. -8. Start quickstep: ```./quickstep_cli_shell --initialize_db=true```. You can - now fire SQL queries. To quit, you can type in ```quit;``` Your data is +8. Start quickstep: ```./quickstep_cli_shell --initialize_db=true```. You can + now fire SQL queries. To quit, you can type in ```quit;``` Your data is stored in the directory ```qsstor```. Note the next time you start Quickstep, - you can omit the ``` --initialize_db``` flag (as the database has already + you can omit the ``` --initialize_db``` flag (as the database has already been initialized), and simply start Quickstep as: ```./quickstep_cli_shell```. There are also a number of optional flags that you can specify, and to see the full list, you can type in: ```./quickstep_cli_shell --help``` @@ -87,21 +87,21 @@ CREATE TABLE City (cid Integer, name VARCHAR(80), state CHAR(2)); SELECT cid, MIN(lowTemperature), MAX(highTemperature) FROM Weather GROUP BY cid; ``` - c. Find the min and max temperature for each city using a nested query, and + c. Find the min and max temperature for each city using a nested query, and printing thie city name: ``` SELECT * FROM City C, (SELECT cid, MIN(lowTemperature), MAX(highTemperature) FROM Weather GROUP BY cid) AS T WHERE C.cid = T.cid; ``` 12. Quickstep also supports a COPY TABLE command. If you want to try that, then - from a separate shell file type in the following: + from a separate shell file type in the following: ``` echo "3|2015-11-3|49|29" > /tmp/tmp.tbl echo "3|2015-11-4|48|28" >> /tmp/tmp.tbl echo "3|2015-11-5|47|27" >> /tmp/tmp.tbl ``` - + Then, load this new data by typing the following SQL in the Quickstep shell: ``` http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/WORKING_WITH_AN_IDE.md ---------------------------------------------------------------------- diff --git a/WORKING_WITH_AN_IDE.md b/WORKING_WITH_AN_IDE.md index f9139ab..017a174 100644 --- a/WORKING_WITH_AN_IDE.md +++ b/WORKING_WITH_AN_IDE.md @@ -37,7 +37,7 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/ ``` Once you have brew installed, simply use brew to install cmake from the -Terminal app by typing: +Terminal app by typing: ``` brew install cmake @@ -90,13 +90,13 @@ cp -R ../qsstor . ``` The above command ensures that you now have the appropriate directory structure -and a starting catalog file to start Quickstep. The default database is called -simply "default" and no relations in it upfront. +and a starting catalog file to start Quickstep. The default database is called +simply "default" and no relations in it upfront. There are other ways of specifying where Quickstep stores the data and catalog. In particular there is a `-storage_path` option that could be an alternative way of specifying the storage path and avoiding the copy above. You can find -these and other command line options by typing: +these and other command line options by typing: ``` ./quickstep_cli_shell -help @@ -104,15 +104,15 @@ these and other command line options by typing: ###4: Debug Quickstep -Now you can debug as you would any normal process in Xcode. Note the +Now you can debug as you would any normal process in Xcode. Note the linenoise option in the cmake command above is important if you are going -to run quickstep from Xcode (by hitting the "play" button). If you are -curious why we have that option, see +to run quickstep from Xcode (by hitting the "play" button). If you are +curious why we have that option, see https://github.com/antirez/linenoise/issues/85. Quickstep uses the linenoise package, and Xcode's embedded terminal has limited functionality. With the cmake option above, we turn off using linenoise. -Sometimes you may want to run quickstep from the command line and still +Sometimes you may want to run quickstep from the command line and still debug with Xcode. For that scenario, you do the following: a) In Xcode, go to `Debug -> Attach to Processs` and type in `quickstep_cli_shell`. If you want to set a breakpoint, you can do @@ -136,7 +136,7 @@ you can examine the stack in Xcode. ###5: Unit Tests Individual unit tests show up as target schemas, so you can simply select them -and run the unit test of interest. +and run the unit test of interest. Running all the unit tests is complicated, and simply picking the `RUN_TESTS` does not work. So, this is a known limitation at this point. You can, however, http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/catalog/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/catalog/CMakeLists.txt b/catalog/CMakeLists.txt index 5bcf6cb..dd4ef99 100644 --- a/catalog/CMakeLists.txt +++ b/catalog/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015-2016 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/catalog/Catalog.proto ---------------------------------------------------------------------- diff --git a/catalog/Catalog.proto b/catalog/Catalog.proto index ea12aae..dbab318 100644 --- a/catalog/Catalog.proto +++ b/catalog/Catalog.proto @@ -80,7 +80,7 @@ message IndexScheme { message CatalogRelationStatistics { optional fixed64 num_tuples = 1; - + message NumDistinctValuesEntry { required int32 attr_id = 1; required fixed64 num_distinct_values = 2; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/cli/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 668bfb8..b86821a 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/cli/tests/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/cli/tests/CMakeLists.txt b/cli/tests/CMakeLists.txt index bda9c30..3bceba8 100644 --- a/cli/tests/CMakeLists.txt +++ b/cli/tests/CMakeLists.txt @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. - + add_subdirectory(command_executor) add_executable(quickstep_cli_tests_CommandExecutorTest http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/expressions/aggregation/AggregateFunction.hpp ---------------------------------------------------------------------- diff --git a/expressions/aggregation/AggregateFunction.hpp b/expressions/aggregation/AggregateFunction.hpp index 40e70bd..cccc699 100644 --- a/expressions/aggregation/AggregateFunction.hpp +++ b/expressions/aggregation/AggregateFunction.hpp @@ -51,7 +51,7 @@ class Type; * AggregationHandle object, then use the methods of AggregationHandle to do * the actual aggregation, then finally delete the AggregationHandle when * finished. - * + * * See AggregationHandle for more detailed information about how aggregates are * actually computed. **/ http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/expressions/window_aggregation/WindowAggregateFunction.hpp ---------------------------------------------------------------------- diff --git a/expressions/window_aggregation/WindowAggregateFunction.hpp b/expressions/window_aggregation/WindowAggregateFunction.hpp index 119c5c3..2b26ccf 100644 --- a/expressions/window_aggregation/WindowAggregateFunction.hpp +++ b/expressions/window_aggregation/WindowAggregateFunction.hpp @@ -56,7 +56,7 @@ class WindowAggregationHandle; * WindowAggregationHandle object, then use the methods of * WindowAggregationHandle to do the actual window aggregation. Finally, delete * the WindowAggregationHandle after finished. - * + * * See WindowAggregationHandle for more detailed information about how * window aggregates are actually computed. **/ @@ -127,7 +127,7 @@ class WindowAggregateFunction { * @param is_row True if the frame mode is ROWS, false if RANGE. * @param num_preceding The number of rows/range that precedes the current row. * @param num_following The number of rows/range that follows the current row. - * + * * @return A new WindowAggregationHandle that can be used to compute this * WindowAggregateFunction over the specified window definition. * Caller is responsible for deleting the returned object. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/expressions/window_aggregation/WindowAggregateFunction.proto ---------------------------------------------------------------------- diff --git a/expressions/window_aggregation/WindowAggregateFunction.proto b/expressions/window_aggregation/WindowAggregateFunction.proto index 33158b8..2c4e05f 100644 --- a/expressions/window_aggregation/WindowAggregateFunction.proto +++ b/expressions/window_aggregation/WindowAggregateFunction.proto @@ -24,7 +24,7 @@ message WindowAggregateFunction { COUNT = 1; MAX = 2; MIN = 3; - SUM = 4; + SUM = 4; } required WindowAggregationID window_aggregation_id = 1; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/parser/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/parser/CMakeLists.txt b/parser/CMakeLists.txt index e1d6826..b1bd870 100644 --- a/parser/CMakeLists.txt +++ b/parser/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/parser/ParseSimpleTableReference.hpp ---------------------------------------------------------------------- diff --git a/parser/ParseSimpleTableReference.hpp b/parser/ParseSimpleTableReference.hpp index 804eec3..4ff92a5 100644 --- a/parser/ParseSimpleTableReference.hpp +++ b/parser/ParseSimpleTableReference.hpp @@ -43,7 +43,7 @@ class ParseTreeNode; class ParseSimpleTableReference : public ParseTableReference { public: /** - * @brief Constructor. + * @brief Constructor. * @note Takes ownership of \p table_name and \p sample. * * @param line_number The line number of the first token of the table reference. @@ -99,4 +99,4 @@ class ParseSimpleTableReference : public ParseTableReference { } // namespace quickstep -#endif /* QUICKSTEP_PARSER_PARSE_SIMPLE_TABLE_REFERENCE_HPP_ */ +#endif // QUICKSTEP_PARSER_PARSE_SIMPLE_TABLE_REFERENCE_HPP_ http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/parser/ParseWindow.hpp ---------------------------------------------------------------------- diff --git a/parser/ParseWindow.hpp b/parser/ParseWindow.hpp index 0ebb4ae..5d7bf98 100644 --- a/parser/ParseWindow.hpp +++ b/parser/ParseWindow.hpp @@ -44,7 +44,7 @@ struct ParseFrameInfo : ParseTreeNode { * the current row in the frame. * @param num_follow The number of rows/value of range that is following * the current row in the frame. - **/ + **/ ParseFrameInfo(const int line_number, const int column_number, const bool is_row_in, http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/parser/SqlParser.ypp ---------------------------------------------------------------------- diff --git a/parser/SqlParser.ypp b/parser/SqlParser.ypp index 017db4a..3f0cc80 100644 --- a/parser/SqlParser.ypp +++ b/parser/SqlParser.ypp @@ -1178,7 +1178,7 @@ opt_priority_clause: } } }; - + with_clause: TOKEN_WITH with_list { $$ = $2; @@ -1420,7 +1420,7 @@ window_declaration: TOKEN_WINDOW any_name TOKEN_AS '(' window_definition ')' { $$ = $5; $$->setName($2); - } + } window_definition: opt_window_partition opt_window_order opt_window_frame { @@ -1461,7 +1461,7 @@ frame_mode: frame_preceding: TOKEN_UNSIGNED_NUMVAL TOKEN_PRECEDING - | TOKEN_UNBOUNDED TOKEN_PRECEDING { + | TOKEN_UNBOUNDED TOKEN_PRECEDING { $$ = new quickstep::NumericParseLiteralValue(@1.first_line, @1.first_column, "-1"); } | TOKEN_CURRENT TOKEN_ROW { http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/parser/tests/Index.test ---------------------------------------------------------------------- diff --git a/parser/tests/Index.test b/parser/tests/Index.test index b0d0e4f..d97701b 100644 --- a/parser/tests/Index.test +++ b/parser/tests/Index.test @@ -1,4 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/parser/tests/Select.test ---------------------------------------------------------------------- diff --git a/parser/tests/Select.test b/parser/tests/Select.test index 5c9758b..b614a99 100644 --- a/parser/tests/Select.test +++ b/parser/tests/Select.test @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 @@ -1630,7 +1628,7 @@ SelectStatement # IN predicate SELECT * -FROM test +FROM test WHERE col1 IN (1, 3, 5); -- SelectStatement @@ -1783,7 +1781,7 @@ SelectStatement +-AttributeReference[attribute_name=attr4] == -SELECT avg(attr1) OVER w FROM test +SELECT avg(attr1) OVER w FROM test WINDOW w AS (PARTITION BY attr2, attr3 ORDER BY attr4 DESC NULLS FIRST, attr5 ASC NULLS LAST @@ -1810,7 +1808,7 @@ SelectStatement +-AttributeReference[attribute_name=attr5] == -SELECT avg(attr1) OVER w1 AS avg1, sum(attr5) OVER w2 AS sum5 FROM test +SELECT avg(attr1) OVER w1 AS avg1, sum(attr5) OVER w2 AS sum5 FROM test WINDOW w1 AS (PARTITION BY attr2, attr3 ORDER BY attr4 @@ -1849,7 +1847,7 @@ SelectStatement +-AttributeReference[attribute_name=attr6] == -SELECT avg(attr1) OVER +SELECT avg(attr1) OVER (PARTITION BY attr2, attr3 ORDER BY attr4 DESC NULLS FIRST, attr5 ASC NULLS LAST RANGE BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/parser/tests/TPCH.test ---------------------------------------------------------------------- diff --git a/parser/tests/TPCH.test b/parser/tests/TPCH.test index fe4c963..e30d373 100644 --- a/parser/tests/TPCH.test +++ b/parser/tests/TPCH.test @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_execution/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_execution/CMakeLists.txt b/query_execution/CMakeLists.txt index d0d1497..4b180e3 100644 --- a/query_execution/CMakeLists.txt +++ b/query_execution/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015-2016 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_execution/QueryExecutionMessages.proto ---------------------------------------------------------------------- diff --git a/query_execution/QueryExecutionMessages.proto b/query_execution/QueryExecutionMessages.proto index cd6ebc8..66ca874 100644 --- a/query_execution/QueryExecutionMessages.proto +++ b/query_execution/QueryExecutionMessages.proto @@ -40,8 +40,8 @@ message NormalWorkOrderCompletionMessage { required uint64 operator_index = 1; required uint64 worker_thread_index = 2; required uint64 query_id = 3; - - // Epoch time in microseconds. + + // Epoch time in microseconds. optional uint64 execution_start_time = 4; optional uint64 execution_end_time = 5; } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/CMakeLists.txt b/query_optimizer/CMakeLists.txt index e071037..c24ee89 100644 --- a/query_optimizer/CMakeLists.txt +++ b/query_optimizer/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015-2016 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/cost_model/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/cost_model/CMakeLists.txt b/query_optimizer/cost_model/CMakeLists.txt index fed7eb2..abbc3da 100644 --- a/query_optimizer/cost_model/CMakeLists.txt +++ b/query_optimizer/cost_model/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/expressions/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/expressions/CMakeLists.txt b/query_optimizer/expressions/CMakeLists.txt index 25e4f5c..35fac90 100644 --- a/query_optimizer/expressions/CMakeLists.txt +++ b/query_optimizer/expressions/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/logical/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/logical/CMakeLists.txt b/query_optimizer/logical/CMakeLists.txt index 9640f79..c67f96f 100644 --- a/query_optimizer/logical/CMakeLists.txt +++ b/query_optimizer/logical/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015-2016 Pivotal Software, Inc. # 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 @@ -204,7 +202,7 @@ target_link_libraries(quickstep_queryoptimizer_logical_Sample quickstep_queryoptimizer_logical_Logical quickstep_queryoptimizer_logical_LogicalType quickstep_utility_Cast - quickstep_utility_Macros) + quickstep_utility_Macros) target_link_libraries(quickstep_queryoptimizer_logical_SharedSubplanReference glog quickstep_queryoptimizer_OptimizerTree http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/logical/Sample.hpp ---------------------------------------------------------------------- diff --git a/query_optimizer/logical/Sample.hpp b/query_optimizer/logical/Sample.hpp index 11017e5..e2403c5 100644 --- a/query_optimizer/logical/Sample.hpp +++ b/query_optimizer/logical/Sample.hpp @@ -43,7 +43,7 @@ class Sample; typedef std::shared_ptr SamplePtr; /** - * @brief Sample operator that samples the data at a block level or + * @brief Sample operator that samples the data at a block level or * at the tuple level and outputs them as a new relation. */ class Sample : public Logical { @@ -89,7 +89,7 @@ class Sample : public Logical { * relation produced by \p input. * @param input The input operator to this Sample. * @param is_block_sample Flag indicating if the sampling is either a block or - * tuple level sampling + * tuple level sampling * @param percentage The percentage of tuples/blocks to be sampled * * @return An immutable Sample. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/physical/Sample.hpp ---------------------------------------------------------------------- diff --git a/query_optimizer/physical/Sample.hpp b/query_optimizer/physical/Sample.hpp index 3bff18c..e3e8f17 100644 --- a/query_optimizer/physical/Sample.hpp +++ b/query_optimizer/physical/Sample.hpp @@ -44,7 +44,7 @@ class Sample; typedef std::shared_ptr SamplePtr; /** - * @brief Sample operator that samples the data at a block level or + * @brief Sample operator that samples the data at a block level or * at the tuple level and outputs them as a new relation. */ class Sample : public Physical { @@ -93,7 +93,7 @@ class Sample : public Physical { * @brief Creates a SamplePtr. * @param input The input node. * @param is_block_sample Flag indicating if the sample is block or tuple level - * @param percentage The percentage of rows or blocks to be sampled + * @param percentage The percentage of rows or blocks to be sampled * @return An immutable Sample. */ static SamplePtr Create(const PhysicalPtr &input, http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/resolver/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/resolver/CMakeLists.txt b/query_optimizer/resolver/CMakeLists.txt index a6e186f..5251ccc 100644 --- a/query_optimizer/resolver/CMakeLists.txt +++ b/query_optimizer/resolver/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/resolver/Resolver.hpp ---------------------------------------------------------------------- diff --git a/query_optimizer/resolver/Resolver.hpp b/query_optimizer/resolver/Resolver.hpp index 7f4bd7c..7bfeed2 100644 --- a/query_optimizer/resolver/Resolver.hpp +++ b/query_optimizer/resolver/Resolver.hpp @@ -501,7 +501,7 @@ class Resolver { /** * @brief Resolves a table/scalar subquery expression. - * + * * @param parse_subquery_expression The parsed subquery expression. * @param type_hints The type hints for output columns by the subquery. * @param expression_resolution_info Resolution info that contains the name http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/rules/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/rules/CMakeLists.txt b/query_optimizer/rules/CMakeLists.txt index 2f3bca8..d9709ce 100644 --- a/query_optimizer/rules/CMakeLists.txt +++ b/query_optimizer/rules/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/strategy/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/query_optimizer/strategy/CMakeLists.txt b/query_optimizer/strategy/CMakeLists.txt index 6fec3cc..002fa9b 100644 --- a/query_optimizer/strategy/CMakeLists.txt +++ b/query_optimizer/strategy/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/tests/execution_generator/Select.test ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/execution_generator/Select.test b/query_optimizer/tests/execution_generator/Select.test index 116f2b3..7d662e9 100644 --- a/query_optimizer/tests/execution_generator/Select.test +++ b/query_optimizer/tests/execution_generator/Select.test @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015-2016 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/tests/logical_generator/Select.test ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/logical_generator/Select.test b/query_optimizer/tests/logical_generator/Select.test index 8223485..4996110 100644 --- a/query_optimizer/tests/logical_generator/Select.test +++ b/query_optimizer/tests/logical_generator/Select.test @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/tests/physical_generator/Select.test ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/physical_generator/Select.test b/query_optimizer/tests/physical_generator/Select.test index 152e9de..f81cad8 100644 --- a/query_optimizer/tests/physical_generator/Select.test +++ b/query_optimizer/tests/physical_generator/Select.test @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/query_optimizer/tests/resolver/Select.test ---------------------------------------------------------------------- diff --git a/query_optimizer/tests/resolver/Select.test b/query_optimizer/tests/resolver/Select.test index e16eca8..7033dec 100644 --- a/query_optimizer/tests/resolver/Select.test +++ b/query_optimizer/tests/resolver/Select.test @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/relational_operators/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/relational_operators/CMakeLists.txt b/relational_operators/CMakeLists.txt index d6b8e66..9696392 100644 --- a/relational_operators/CMakeLists.txt +++ b/relational_operators/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015-2016 Pivotal Software, Inc. # 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 @@ -438,7 +436,7 @@ target_link_libraries(quickstep_relationaloperators_WindowAggregationOperator quickstep_storage_StorageBlockInfo quickstep_storage_WindowAggregationOperationState quickstep_utility_Macros - tmb) + tmb) target_link_libraries(quickstep_relationaloperators_WorkOrder glog quickstep_queryexecution_QueryExecutionTypedefs http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/storage/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 90f9a6b..c4b8f70 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015-2016 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/storage/EvictionPolicy.cpp ---------------------------------------------------------------------- diff --git a/storage/EvictionPolicy.cpp b/storage/EvictionPolicy.cpp index fc3f822..2f10f09 100644 --- a/storage/EvictionPolicy.cpp +++ b/storage/EvictionPolicy.cpp @@ -312,12 +312,12 @@ class LRUKEvictionPolicyImpl : public EvictionPolicy { #ifdef QUICKSTEP_DEBUG /** * @brief Prints the contents of the LRUKEvictionPolicyImpl. Use this - * strictly for debugging purposes. + * strictly for debugging purposes. * WARNING: This method is not safe as it does not acquire - * any mutexes on the internal state variable, so use it + * any mutexes on the internal state variable, so use it * primarily for debugging purposes. * - * @param print_map If true, print the eviction map. + * @param print_map If true, print the eviction map. * @param print_nr_list If true, print the list of non referenced blocks. * */ http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/storage/HashTableKeyManager.hpp ---------------------------------------------------------------------- diff --git a/storage/HashTableKeyManager.hpp b/storage/HashTableKeyManager.hpp index 553d57c..0295ad4 100644 --- a/storage/HashTableKeyManager.hpp +++ b/storage/HashTableKeyManager.hpp @@ -202,7 +202,7 @@ class HashTableKeyManager { * @param bucket A pointer to the bucket in the HashTable to write the key * to. * @param prealloc_state If non-null, variable length key components will be - * located in preallocated variable-length storage. + * located in preallocated variable-length storage. **/ inline void writeKeyComponentToBucket( const TypedValue &component, http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/storage/StorageBlockLayout.proto ---------------------------------------------------------------------- diff --git a/storage/StorageBlockLayout.proto b/storage/StorageBlockLayout.proto index fdf043e..48f874f 100644 --- a/storage/StorageBlockLayout.proto +++ b/storage/StorageBlockLayout.proto @@ -65,7 +65,7 @@ message IndexSubBlockDescription { SMA = 1; BLOOM_FILTER = 2; BITWEAVING_H = 3; - BITWEAVING_V = 4; + BITWEAVING_V = 4; } required IndexSubBlockType sub_block_type = 1; http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/storage/WindowAggregationOperationState.hpp ---------------------------------------------------------------------- diff --git a/storage/WindowAggregationOperationState.hpp b/storage/WindowAggregationOperationState.hpp index 8d7b535..aaa8e37 100644 --- a/storage/WindowAggregationOperationState.hpp +++ b/storage/WindowAggregationOperationState.hpp @@ -45,7 +45,7 @@ class WindowAggregateFunction; */ /** - * @brief Helper class for maintaining the state of window aggregation. + * @brief Helper class for maintaining the state of window aggregation. **/ class WindowAggregationOperationState { public: http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/third_party/README.md ---------------------------------------------------------------------- diff --git a/third_party/README.md b/third_party/README.md index 3109ca1..cfb1a51 100644 --- a/third_party/README.md +++ b/third_party/README.md @@ -2,6 +2,6 @@ This directory includes various open-source third-party code that is used by Quickstep. Some code has been modified slightly to fix build issues or to integrate -with Quickstep. With the exception of the code in the `tmb` and the `protobuf_cmake` -directories (which are part of the Quickstep project itself), all libraries here +with Quickstep. With the exception of the code in the `tmb` and the `protobuf_cmake` +directories (which are part of the Quickstep project itself), all libraries here belong to their original authors and are governed by their respective licenses. http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/third_party/glog/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/third_party/glog/CMakeLists.txt b/third_party/glog/CMakeLists.txt index afd9e28..a916b96 100644 --- a/third_party/glog/CMakeLists.txt +++ b/third_party/glog/CMakeLists.txt @@ -1,6 +1,19 @@ -# This file copyright (c) 2011-2015, Quickstep Technologies LLC. -# All rights reserved. -# See file CREDITS.txt for details. +# 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. # This file allows building glog with CMake instead of autotools. glog itself # is copyright Google, Inc. and is covered by the license described in the @@ -131,7 +144,7 @@ else() set(UCONTEXT_INCLUDES "${UCONTEXT_INCLUDES}\n#include ") endif() - foreach (pc_field + foreach (pc_field "uc_mcontext.gregs[REG_EIP]" "uc_mcontext.gregs[REG_RIP]" "uc_mcontext.sc_ip" http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/third_party/protobuf_cmake/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/third_party/protobuf_cmake/CMakeLists.txt b/third_party/protobuf_cmake/CMakeLists.txt index 22c6194..7e08056 100644 --- a/third_party/protobuf_cmake/CMakeLists.txt +++ b/third_party/protobuf_cmake/CMakeLists.txt @@ -1,17 +1,19 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. +# 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 # -# Licensed 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 # -# 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. +# 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. # This CMakeLists file allows building protobufs as part of the regular CMake # build process instead of using autotools (on UNIX) or Visual Studio projects http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/types/operations/Operation.proto ---------------------------------------------------------------------- diff --git a/types/operations/Operation.proto b/types/operations/Operation.proto index 7e5e836..9fe5448 100644 --- a/types/operations/Operation.proto +++ b/types/operations/Operation.proto @@ -76,7 +76,7 @@ message SubstringOperation { extend UnaryOperation { // Required when operation_id = SUBSTRING. optional int64 start_position = 100; - optional int64 substring_length = 101; + optional int64 substring_length = 101; } } http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/types/operations/binary_operations/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/types/operations/binary_operations/CMakeLists.txt b/types/operations/binary_operations/CMakeLists.txt index 203026a..071e9fb 100644 --- a/types/operations/binary_operations/CMakeLists.txt +++ b/types/operations/binary_operations/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015-2016 Pivotal Software, Inc. # 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 http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/types/operations/comparisons/ComparisonID.hpp ---------------------------------------------------------------------- diff --git a/types/operations/comparisons/ComparisonID.hpp b/types/operations/comparisons/ComparisonID.hpp index b81aa5a..ff9c72f 100644 --- a/types/operations/comparisons/ComparisonID.hpp +++ b/types/operations/comparisons/ComparisonID.hpp @@ -63,12 +63,12 @@ extern const char *kComparisonShortNames[ ComparisonID::kNumComparisonIDs)]; /** - * @brief Flips a comparison. - * + * @brief Flips a comparison. + * * As in greater than flips to less than, less than flips to greater than, and * similarly for greater/less than or equals. Notice that flipping equals * results in equals, same for not equals. - * + * * @param comparison The Id of a comparison to flip. * @return The flipped comparison id. */ http://git-wip-us.apache.org/repos/asf/incubator-quickstep/blob/07419275/types/operations/unary_operations/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/types/operations/unary_operations/CMakeLists.txt b/types/operations/unary_operations/CMakeLists.txt index 05f1453..d612464 100644 --- a/types/operations/unary_operations/CMakeLists.txt +++ b/types/operations/unary_operations/CMakeLists.txt @@ -1,5 +1,3 @@ -# Copyright 2011-2015 Quickstep Technologies LLC. -# Copyright 2015 Pivotal Software, Inc. # 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