[
https://issues.apache.org/jira/browse/BEAM-3348?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16306369#comment-16306369
]
ASF GitHub Bot commented on BEAM-3348:
--------------------------------------
XuMingmin closed pull request #4258: [BEAM-3348] Set utf-16 as SQL DSL default
charset
URL: https://github.com/apache/beam/pull/4258
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java
index ce46e2d4399..a32759d40e4 100644
---
a/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java
+++
b/sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/planner/BeamQueryPlanner.java
@@ -56,6 +56,7 @@
import org.apache.calcite.tools.Planner;
import org.apache.calcite.tools.RelConversionException;
import org.apache.calcite.tools.ValidationException;
+import org.apache.calcite.util.ConversionUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -74,6 +75,15 @@
RelDataTypeSystem.DEFAULT);
public BeamQueryPlanner(SchemaPlus schema) {
+ String defaultCharsetKey = "saffron.default.charset";
+ if (System.getProperty(defaultCharsetKey) == null) {
+ System.setProperty(defaultCharsetKey,
ConversionUtil.NATIVE_UTF16_CHARSET_NAME);
+ System.setProperty("saffron.default.nationalcharset",
+ ConversionUtil.NATIVE_UTF16_CHARSET_NAME);
+ System.setProperty("saffron.default.collation.name",
+ String.format("%s$%s", ConversionUtil.NATIVE_UTF16_CHARSET_NAME,
"en_US"));
+ }
+
final List<RelTraitDef> traitDefs = new ArrayList<>();
traitDefs.add(ConventionTraitDef.INSTANCE);
traitDefs.add(RelCollationTraitDef.INSTANCE);
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslBase.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslBase.java
index b27435c9d2c..52987b8bc5c 100644
---
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslBase.java
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlDslBase.java
@@ -127,7 +127,7 @@ public void preparePCollections(){
rows.add(row3);
BeamRecord row4 = new BeamRecord(rowTypeInTableA
- , 4, 4000L, Short.valueOf("4"), Byte.valueOf("4"), 4.0f, 4.0,
"string_row4"
+ , 4, 4000L, Short.valueOf("4"), Byte.valueOf("4"), 4.0f, 4.0, "第四行"
, FORMAT.parse("2017-01-01 02:04:03"), 0, new BigDecimal(4));
rows.add(row4);
diff --git
a/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlNonAsciiTest.java
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlNonAsciiTest.java
new file mode 100644
index 00000000000..e4debe0b6b3
--- /dev/null
+++
b/sdks/java/extensions/sql/src/test/java/org/apache/beam/sdk/extensions/sql/BeamSqlNonAsciiTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ */
+package org.apache.beam.sdk.extensions.sql;
+
+import org.apache.beam.sdk.testing.PAssert;
+import org.apache.beam.sdk.values.BeamRecord;
+import org.apache.beam.sdk.values.PCollection;
+import org.apache.beam.sdk.values.PCollectionTuple;
+import org.apache.beam.sdk.values.TupleTag;
+import org.junit.Test;
+
+/**
+ * Tests for non ascii char in sql.
+ */
+public class BeamSqlNonAsciiTest extends BeamSqlDslBase {
+
+ @Test
+ public void testDefaultCharsetLiteral() {
+ String sql = "SELECT * FROM TABLE_A WHERE f_string = '第四行'";
+
+ PCollection<BeamRecord> result =
+ PCollectionTuple.of(new TupleTag<BeamRecord>("TABLE_A"),
boundedInput1)
+ .apply("testCompositeFilter", BeamSql.queryMulti(sql));
+
+ PAssert.that(result).containsInAnyOrder(recordsInTableA.get(3));
+
+ pipeline.run().waitUntilFinish();
+ }
+
+ @Test
+ public void testNationalCharsetLiteral() {
+ String sql = "SELECT * FROM TABLE_A WHERE f_string = N'第四行'";
+
+ PCollection<BeamRecord> result =
+ PCollectionTuple.of(new TupleTag<BeamRecord>("TABLE_A"),
boundedInput1)
+ .apply("testCompositeFilter", BeamSql.queryMulti(sql));
+
+ PAssert.that(result).containsInAnyOrder(recordsInTableA.get(3));
+
+ pipeline.run().waitUntilFinish();
+ }
+}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Beam SQL DSL not support non-ascii characters in sql
> ----------------------------------------------------
>
> Key: BEAM-3348
> URL: https://issues.apache.org/jira/browse/BEAM-3348
> Project: Beam
> Issue Type: Bug
> Components: dsl-sql
> Affects Versions: 2.2.0
> Reporter: Yiyan Lu
> Assignee: Xu Mingmin
>
> When I have non-ascii in Beam SQL:
> ```
> SELECT * FROM TABLE_A WHERE f_string = '第四行'
> ```
> calcite planner will throw exception:
> ```
> Caused by: org.apache.calcite.runtime.CalciteException: Failed to encode
> '第四行' in character set 'ISO-8859-1'
> ```
> cause by calcite using ISO-8859-1 for default charset
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
