You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2021/09/24 00:44:08 UTC
[calcite] branch master updated (b51a2e1 -> d4640d0)
This is an automated email from the ASF dual-hosted git repository.
jhyde pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git.
from b51a2e1 [CALCITE-4544] Deprecate Metadata API backed by Java Reflection (James Starr)
new d65397a Replace deprecated com.google.common.io.Files.createTempDir() with java.nio.file.Files.createTempDirectory() in ElasticSearch tests
new d4640d0 [CALCITE-4793] CassandraAdapterDataTypesTest.testCollectionsInnerValues fails depending on the user timezone (Alessandro Solimando)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../calcite/test/CassandraAdapterDataTypesTest.java | 15 ++++++++++++++-
.../elasticsearch/EmbeddedElasticsearchNode.java | 17 ++++++++++++-----
2 files changed, 26 insertions(+), 6 deletions(-)
[calcite] 01/02: Replace deprecated
com.google.common.io.Files.createTempDir() with
java.nio.file.Files.createTempDirectory() in ElasticSearch tests
Posted by jh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jhyde pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit d65397a6147b16a824b4d2cc78bc71f9e90ee3b6
Author: Alessandro Solimando <al...@gmail.com>
AuthorDate: Thu Sep 23 10:30:10 2021 +0200
Replace deprecated com.google.common.io.Files.createTempDir() with java.nio.file.Files.createTempDirectory() in ElasticSearch tests
---
.../elasticsearch/EmbeddedElasticsearchNode.java | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
index ff566fb..5b7ab5e 100644
--- a/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
+++ b/elasticsearch/src/test/java/org/apache/calcite/adapter/elasticsearch/EmbeddedElasticsearchNode.java
@@ -19,7 +19,6 @@ package org.apache.calcite.adapter.elasticsearch;
import org.apache.calcite.util.TestUtil;
import com.google.common.base.Preconditions;
-import com.google.common.io.Files;
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
@@ -34,6 +33,8 @@ import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.transport.Netty4Plugin;
import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
import java.util.Arrays;
import java.util.Collection;
import java.util.Objects;
@@ -75,10 +76,16 @@ class EmbeddedElasticsearchNode implements AutoCloseable {
* @return instance which needs to be explicitly started (using {@link #start()})
*/
public static synchronized EmbeddedElasticsearchNode create() {
- File data = Files.createTempDir();
- data.deleteOnExit();
- File home = Files.createTempDir();
- home.deleteOnExit();
+ File data;
+ File home;
+ try {
+ data = Files.createTempDirectory("es-data").toFile();
+ data.deleteOnExit();
+ home = Files.createTempDirectory("es-home").toFile();
+ home.deleteOnExit();
+ } catch (IOException e) {
+ throw TestUtil.rethrow(e);
+ }
Settings settings = Settings.builder()
.put("node.name", "fake-elastic")
[calcite] 02/02: [CALCITE-4793]
CassandraAdapterDataTypesTest.testCollectionsInnerValues fails depending on
the user timezone (Alessandro Solimando)
Posted by jh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jhyde pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/calcite.git
commit d4640d0bcca6ba77c4b0911f48b39f4bf47d757f
Author: Alessandro Solimando <al...@gmail.com>
AuthorDate: Thu Sep 23 16:27:27 2021 +0200
[CALCITE-4793] CassandraAdapterDataTypesTest.testCollectionsInnerValues fails depending on the user timezone (Alessandro Solimando)
---
.../calcite/test/CassandraAdapterDataTypesTest.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterDataTypesTest.java b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterDataTypesTest.java
index ffed5e0..c76508d 100644
--- a/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterDataTypesTest.java
+++ b/cassandra/src/test/java/org/apache/calcite/test/CassandraAdapterDataTypesTest.java
@@ -16,7 +16,10 @@
*/
package org.apache.calcite.test;
+import org.apache.calcite.avatica.util.DateTimeUtils;
+
import com.datastax.driver.core.Session;
+import com.datastax.driver.core.TypeCodec;
import com.google.common.collect.ImmutableMap;
import org.cassandraunit.CQLDataLoader;
@@ -27,6 +30,10 @@ import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.parallel.Execution;
import org.junit.jupiter.api.parallel.ExecutionMode;
+import java.util.Calendar;
+import java.util.Locale;
+import java.util.TimeZone;
+
/**
* Tests for the {@code org.apache.calcite.adapter.cassandra} package related to data types.
*
@@ -187,6 +194,12 @@ class CassandraAdapterDataTypesTest {
}
@Test void testCollectionsInnerValues() {
+ // timestamp retrieval depends on the user timezone, we must compute the expected result
+ long v = TypeCodec.timestamp().parse("2015-05-03 13:30:54.234").getTime();
+ // UTC timestamp is adjusted using the offset from the user timezone
+ v -= Calendar.getInstance(TimeZone.getDefault(), Locale.ROOT).getTimeZone().getOffset(v);
+ String expectedTimestamp = DateTimeUtils.unixTimestampToString(v);
+
CalciteAssert.that()
.with(DTCASSANDRA)
.query("select \"f_list\"[1], "
@@ -199,7 +212,7 @@ class CassandraAdapterDataTypesTest {
+ "; EXPR$1=v1"
+ "; 1=3000000000"
+ "; 2=30ff87"
- + "; 3=2015-05-03 11:30:54\n");
+ + "; 3=" + expectedTimestamp + "\n");
}
// frozen collections should not affect the row type