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:04 UTC
[1/4] metamodel git commit: METAMODEL-176: Fixed
Repository: metamodel
Updated Branches:
refs/heads/master 1f6cd03c5 -> fc2752abd
METAMODEL-176: Fixed
Also added DataSet.close() to a few places where it was giving log
warnings during build/test
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/e3e8357b
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/e3e8357b
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/e3e8357b
Branch: refs/heads/master
Commit: e3e8357b9c5fadce3a7f00b73dff625219bea06f
Parents: 15c94fc
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 18 10:13:54 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 18 10:13:54 2015 +0200
----------------------------------------------------------------------
jdbc/pom.xml | 1 +
.../test/java/org/apache/metamodel/jdbc/DerbyTest.java | 1 +
.../org/apache/metamodel/jdbc/JdbcTestTemplates.java | 11 +++++++++++
3 files changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e3e8357b/jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index cd66794..378ebf0 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -106,6 +106,7 @@ under the License.
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hive</groupId>
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e3e8357b/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java
index 27e76a9..cee8454 100644
--- a/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java
+++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/DerbyTest.java
@@ -140,6 +140,7 @@ public class DerbyTest extends TestCase {
assertTrue(dataSet.next());
assertTrue(dataSet.next());
assertFalse(dataSet.next());
+ dataSet.close();
}
public void testGetSchemaNormalTableTypes() throws Exception {
http://git-wip-us.apache.org/repos/asf/metamodel/blob/e3e8357b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
----------------------------------------------------------------------
diff --git a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
index ae2d3c9..e04e4c6 100644
--- a/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
+++ b/jdbc/src/test/java/org/apache/metamodel/jdbc/JdbcTestTemplates.java
@@ -156,42 +156,49 @@ public class JdbcTestTemplates {
assertTrue(ds.next());
assertEquals("1", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// regular NOT EQUALS
ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").ne("C02").execute();
assertTrue(ds.next());
assertEquals("3", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// regular GREATER THAN
ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("id").gt(2).execute();
assertTrue(ds.next());
assertEquals("2", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// regular LESS THAN
ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("id").lt(2).execute();
assertTrue(ds.next());
assertEquals("1", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// IS NULL
ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").isNull().execute();
assertTrue(ds.next());
assertEquals("1", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// IS NOT NULL
ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").isNotNull().execute();
assertTrue(ds.next());
assertEquals("3", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// LIKE
ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").like("C%").execute();
assertTrue(ds.next());
assertEquals("3", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// regular IN (with string)
ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("code").in("C01", "C02")
@@ -199,12 +206,14 @@ public class JdbcTestTemplates {
assertTrue(ds.next());
assertEquals("2", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// regular IN (with decimals)
ds = dc.query().from(schema.getTableByName("test_table")).selectCount().where("id").in(1.0, 2.0, 4.0).execute();
assertTrue(ds.next());
assertEquals("3", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
// irregular IN (with null value) - (currently uses SQL's standard way
// of understanding NULL - see ticket #1058)
@@ -217,6 +226,7 @@ public class JdbcTestTemplates {
assertTrue(ds.next());
assertEquals("0", ds.getRow().getValue(0).toString());
assertFalse(ds.next());
+ ds.close();
}
public static void meaningOfOneSizeChar(Connection conn) throws Exception {
@@ -259,6 +269,7 @@ public class JdbcTestTemplates {
assertTrue(ds.next());
assertNull(ds.getRow().getValue(0));
assertFalse(ds.next());
+ ds.close();
}
public static void automaticConversionWhenInsertingString(Connection conn) throws Exception {
[2/4] metamodel git commit: Merge branch 'master' into METAMODEL-176
Posted by ka...@apache.org.
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(-)
----------------------------------------------------------------------
[4/4] metamodel git commit: Merge remote-tracking branch
'origin/master' into METAMODEL-176
Posted by ka...@apache.org.
Merge remote-tracking branch 'origin/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/fc2752ab
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/fc2752ab
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/fc2752ab
Branch: refs/heads/master
Commit: fc2752abd48f35f91e8058df19c379b37197ef53
Parents: 4b5decb 1f6cd03
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 18 22:38:41 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 18 22:38:41 2015 +0200
----------------------------------------------------------------------
CHANGES.md | 1 +
.../cassandra/CassandraDataContextTest.java | 77 ++++++++++++--------
2 files changed, 49 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/fc2752ab/CHANGES.md
----------------------------------------------------------------------
diff --cc CHANGES.md
index d4f35c0,3257bf3..f72768a
--- a/CHANGES.md
+++ b/CHANGES.md
@@@ -1,9 -1,9 +1,10 @@@
### Apache MetaModel (latest)
* [METAMODEL-173] - Improved CSV writing to non-file destinations. Added .write() and .append() methods to Resource interface.
+ * [METAMODEL-176] - Trimmed the transient dependencies of the JDBC module.
* [METAMODEL-170] - Dropped support for Java 6.
* [METAMODEL-178] - Added AggregateFunction and ScalarFunction interfaces. Changed FunctionType enum to be super-interface of those. Compatibility is retained but a recompile of code using FunctionType is needed.
+ * [METAMODEL-171] - Made integration tests for Cassandra module function properly in all environments.
### Apache MetaModel 4.3.6
[3/4] metamodel git commit: Updated CHANGES.md
Posted by ka...@apache.org.
Updated CHANGES.md
Fixes #41
Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo
Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/4b5decbb
Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/4b5decbb
Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/4b5decbb
Branch: refs/heads/master
Commit: 4b5decbbb16002b0a9b2ef0009bab45b0bc53998
Parents: 4bed0e3
Author: Kasper Sørensen <i....@gmail.com>
Authored: Tue Aug 18 22:27:51 2015 +0200
Committer: Kasper Sørensen <i....@gmail.com>
Committed: Tue Aug 18 22:27:51 2015 +0200
----------------------------------------------------------------------
CHANGES.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metamodel/blob/4b5decbb/CHANGES.md
----------------------------------------------------------------------
diff --git a/CHANGES.md b/CHANGES.md
index 5ce13c4..d4f35c0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,7 @@
### Apache MetaModel (latest)
* [METAMODEL-173] - Improved CSV writing to non-file destinations. Added .write() and .append() methods to Resource interface.
+ * [METAMODEL-176] - Trimmed the transient dependencies of the JDBC module.
* [METAMODEL-170] - Dropped support for Java 6.
* [METAMODEL-178] - Added AggregateFunction and ScalarFunction interfaces. Changed FunctionType enum to be super-interface of those. Compatibility is retained but a recompile of code using FunctionType is needed.