This is an automated email from the ASF dual-hosted git repository.
hutran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git
The following commit(s) were added to refs/heads/master by this push:
new 5ecf9a1 [GOBBLIN-1369] Fix wrong method name:
exractSampleRecordCountFromQuery
5ecf9a1 is described below
commit 5ecf9a175d745e1b2b46bea5de4ba89512866e5e
Author: Kengo Seki <[email protected]>
AuthorDate: Thu Jan 21 09:12:17 2021 -0800
[GOBBLIN-1369] Fix wrong method name: exractSampleRecordCountFromQuery
Closes #3210 from sekikn/GOBBLIN-1369
---
.../java/org/apache/gobblin/source/jdbc/JdbcExtractor.java | 2 +-
.../org/apache/gobblin/source/jdbc/JdbcSpecificLayer.java | 2 +-
.../java/org/apache/gobblin/source/jdbc/MysqlExtractor.java | 2 +-
.../java/org/apache/gobblin/source/jdbc/OracleExtractor.java | 2 +-
.../org/apache/gobblin/source/jdbc/PostgresqlExtractor.java | 2 +-
.../org/apache/gobblin/source/jdbc/SqlServerExtractor.java | 2 +-
.../org/apache/gobblin/source/jdbc/TeradataExtractor.java | 2 +-
.../org/apache/gobblin/source/jdbc/OracleExtractorTest.java | 12 ++++++------
.../apache/gobblin/source/jdbc/PostgresqlExtractorTest.java | 10 +++++-----
9 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java
index f6eb79e..7a28157 100644
---
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java
+++
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcExtractor.java
@@ -306,7 +306,7 @@ public abstract class JdbcExtractor extends
QueryBasedExtractor<JsonArray, JsonE
ConfigurationKeys.ENABLE_DELIMITED_IDENTIFIER,
ConfigurationKeys.DEFAULT_ENABLE_DELIMITED_IDENTIFIER);
JsonObject defaultWatermark = this.getDefaultWatermark();
String derivedWatermarkColumnName =
defaultWatermark.get("columnName").getAsString();
-
this.setSampleRecordCount(this.exractSampleRecordCountFromQuery(inputQuery));
+
this.setSampleRecordCount(this.extractSampleRecordCountFromQuery(inputQuery));
inputQuery = this.removeSampleClauseFromQuery(inputQuery);
JsonArray targetSchema = new JsonArray();
List<String> headerColumns = new ArrayList<>();
diff --git
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcSpecificLayer.java
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcSpecificLayer.java
index 2b922f6..68eccb6 100644
---
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcSpecificLayer.java
+++
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/JdbcSpecificLayer.java
@@ -36,7 +36,7 @@ public interface JdbcSpecificLayer {
* @param query
* @return record count
*/
- public long exractSampleRecordCountFromQuery(String query);
+ public long extractSampleRecordCountFromQuery(String query);
/**
* Remove sample clause in input query
diff --git
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/MysqlExtractor.java
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/MysqlExtractor.java
index 4849c40..ed7477b 100644
---
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/MysqlExtractor.java
+++
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/MysqlExtractor.java
@@ -231,7 +231,7 @@ public class MysqlExtractor extends JdbcExtractor {
}
@Override
- public long exractSampleRecordCountFromQuery(String query) {
+ public long extractSampleRecordCountFromQuery(String query) {
if (StringUtils.isBlank(query)) {
return SAMPLERECORDCOUNT;
}
diff --git
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/OracleExtractor.java
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/OracleExtractor.java
index 01001eb..e475af5 100644
---
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/OracleExtractor.java
+++
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/OracleExtractor.java
@@ -205,7 +205,7 @@ public class OracleExtractor extends JdbcExtractor {
}
@Override
- public long exractSampleRecordCountFromQuery(String query) {
+ public long extractSampleRecordCountFromQuery(String query) {
if (StringUtils.isBlank(query)) {
return SAMPLERECORDCOUNT;
}
diff --git
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/PostgresqlExtractor.java
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/PostgresqlExtractor.java
index 6876739..873e2d8 100644
---
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/PostgresqlExtractor.java
+++
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/PostgresqlExtractor.java
@@ -212,7 +212,7 @@ public class PostgresqlExtractor extends JdbcExtractor {
}
@Override
- public long exractSampleRecordCountFromQuery(String query) {
+ public long extractSampleRecordCountFromQuery(String query) {
if (StringUtils.isBlank(query)) {
return SAMPLERECORDCOUNT;
}
diff --git
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/SqlServerExtractor.java
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/SqlServerExtractor.java
index b6984e6..c3713e1 100644
---
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/SqlServerExtractor.java
+++
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/SqlServerExtractor.java
@@ -203,7 +203,7 @@ public class SqlServerExtractor extends JdbcExtractor {
}
@Override
- public long exractSampleRecordCountFromQuery(String query) {
+ public long extractSampleRecordCountFromQuery(String query) {
if (StringUtils.isBlank(query)) {
return SAMPLERECORDCOUNT;
}
diff --git
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/TeradataExtractor.java
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/TeradataExtractor.java
index 013bc15..0d53a8c 100644
---
a/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/TeradataExtractor.java
+++
b/gobblin-modules/gobblin-sql/src/main/java/org/apache/gobblin/source/jdbc/TeradataExtractor.java
@@ -209,7 +209,7 @@ public class TeradataExtractor extends JdbcExtractor {
}
@Override
- public long exractSampleRecordCountFromQuery(String query) {
+ public long extractSampleRecordCountFromQuery(String query) {
if (isNullOrEmpty(query)) {
return SAMPLE_RECORD_COUNT;
}
diff --git
a/gobblin-modules/gobblin-sql/src/test/java/org/apache/gobblin/source/jdbc/OracleExtractorTest.java
b/gobblin-modules/gobblin-sql/src/test/java/org/apache/gobblin/source/jdbc/OracleExtractorTest.java
index 6aa914a..0f60696 100644
---
a/gobblin-modules/gobblin-sql/src/test/java/org/apache/gobblin/source/jdbc/OracleExtractorTest.java
+++
b/gobblin-modules/gobblin-sql/src/test/java/org/apache/gobblin/source/jdbc/OracleExtractorTest.java
@@ -94,12 +94,12 @@ public class OracleExtractorTest {
@Test
public void testExractSampleRecordCountFromQuery() {
- long res1 = oracleExtractor.exractSampleRecordCountFromQuery(QUERY_1);
- long res2 = oracleExtractor.exractSampleRecordCountFromQuery(QUERY_2);
- long res3 = oracleExtractor.exractSampleRecordCountFromQuery(QUERY_3);
- long res4 = oracleExtractor.exractSampleRecordCountFromQuery(QUERY_4);
- long res5 = oracleExtractor.exractSampleRecordCountFromQuery(QUERY_EMPTY);
- long res6 = oracleExtractor.exractSampleRecordCountFromQuery(QUERY_REG);
+ long res1 = oracleExtractor.extractSampleRecordCountFromQuery(QUERY_1);
+ long res2 = oracleExtractor.extractSampleRecordCountFromQuery(QUERY_2);
+ long res3 = oracleExtractor.extractSampleRecordCountFromQuery(QUERY_3);
+ long res4 = oracleExtractor.extractSampleRecordCountFromQuery(QUERY_4);
+ long res5 = oracleExtractor.extractSampleRecordCountFromQuery(QUERY_EMPTY);
+ long res6 = oracleExtractor.extractSampleRecordCountFromQuery(QUERY_REG);
assertEquals(res1, (long) 532);
assertEquals(res2, (long) 5);
diff --git
a/gobblin-modules/gobblin-sql/src/test/java/org/apache/gobblin/source/jdbc/PostgresqlExtractorTest.java
b/gobblin-modules/gobblin-sql/src/test/java/org/apache/gobblin/source/jdbc/PostgresqlExtractorTest.java
index 4b3ffbd..92c460c 100644
---
a/gobblin-modules/gobblin-sql/src/test/java/org/apache/gobblin/source/jdbc/PostgresqlExtractorTest.java
+++
b/gobblin-modules/gobblin-sql/src/test/java/org/apache/gobblin/source/jdbc/PostgresqlExtractorTest.java
@@ -91,11 +91,11 @@ public class PostgresqlExtractorTest {
@Test
public void testExractSampleRecordCountFromQuery()
throws Exception {
- long res1 = postgresqlExtractor.exractSampleRecordCountFromQuery(QUERY_1);
- long res2 = postgresqlExtractor.exractSampleRecordCountFromQuery(QUERY_2);
- long res3 = postgresqlExtractor.exractSampleRecordCountFromQuery(QUERY_3);
- long res4 =
postgresqlExtractor.exractSampleRecordCountFromQuery(QUERY_EMPTY);
- long res5 =
postgresqlExtractor.exractSampleRecordCountFromQuery(QUERY_REG);
+ long res1 = postgresqlExtractor.extractSampleRecordCountFromQuery(QUERY_1);
+ long res2 = postgresqlExtractor.extractSampleRecordCountFromQuery(QUERY_2);
+ long res3 = postgresqlExtractor.extractSampleRecordCountFromQuery(QUERY_3);
+ long res4 =
postgresqlExtractor.extractSampleRecordCountFromQuery(QUERY_EMPTY);
+ long res5 =
postgresqlExtractor.extractSampleRecordCountFromQuery(QUERY_REG);
assertEquals(res1, (long) 532);
assertEquals(res2, (long) 50);
