You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2015/08/18 22:39:05 UTC
[2/4] metamodel git commit: Merge branch 'master' into METAMODEL-176
Merge branch 'master' into METAMODEL-176
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/4bed0e34
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/4bed0e34
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/4bed0e34
Branch: refs/heads/master
Commit: 4bed0e34a82b666fbe50bd1926b36f57849fe50d
Parents: e3e8357 358379e
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 18 22:26:40 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 18 22:26:40 2015 +0200
----------------------------------------------------------------------
.travis.yml | 1 -
CHANGES.md | 6 +
cassandra/pom.xml | 23 ----
.../org/apache/metamodel/MetaModelHelper.java | 4 +-
.../metamodel/QueryPostprocessDataContext.java | 4 +-
.../metamodel/query/AggregateFunction.java | 54 +++++++++
.../query/AverageAggregateFunction.java | 33 +++++
.../metamodel/query/CountAggregateFunction.java | 39 ++++++
.../query/DefaultAggregateFunction.java | 67 +++++++++++
.../apache/metamodel/query/FunctionType.java | 107 ++---------------
.../metamodel/query/FunctionTypeFactory.java | 43 +++++++
.../metamodel/query/MaxAggregateBuilder.java | 2 +-
.../metamodel/query/MaxAggregateFunction.java | 33 +++++
.../metamodel/query/MinAggregateFunction.java | 33 +++++
.../apache/metamodel/query/ScalarFunction.java | 31 +++++
.../org/apache/metamodel/query/SelectItem.java | 11 +-
.../metamodel/query/SumAggregateFunction.java | 33 +++++
.../query/parser/SelectItemParser.java | 9 +-
.../apache/metamodel/util/AbstractResource.java | 83 +++++++++++++
.../metamodel/util/ClasspathResource.java | 32 ++---
.../org/apache/metamodel/util/FileResource.java | 49 +-------
.../apache/metamodel/util/InMemoryResource.java | 66 ++++------
.../org/apache/metamodel/util/Resource.java | 26 ++++
.../org/apache/metamodel/util/UrlResource.java | 31 +----
.../QueryPostprocessDataContextTest.java | 1 +
.../apache/metamodel/csv/CsvUpdateCallback.java | 120 +++++++++----------
elasticsearch/pom.xml | 43 ++-----
.../ElasticSearchDataContextTest.java | 7 --
.../org/apache/metamodel/util/HdfsResource.java | 108 ++++++++---------
pom.xml | 6 +-
.../apache/metamodel/spring/SpringResource.java | 46 ++-----
31 files changed, 688 insertions(+), 463 deletions(-)
----------------------------------------------------------------------