Changeset: b64e8c5d7ddf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b64e8c5d7ddf
Modified Files:
java/embedded/src/main/java/org/monetdb/embedded/result/column/BooleanColumn.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/ByteColumn.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/Column.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/DoubleColumn.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/FloatColumn.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/LongColumn.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/ShortColumn.java
java/embedded/src/main/java/org/monetdb/embedded/result/column/StringColumn.java
java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
Branch: embedded-java
Log Message:
Fix typo in getValue()
diffs (261 lines):
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/BooleanColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/BooleanColumn.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/BooleanColumn.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/BooleanColumn.java
@@ -21,7 +21,7 @@ public class BooleanColumn extends Colum
}
@Override
- public Boolean getVaule(int index) {
+ public Boolean getValue(int index) {
if (isNullValue(index) || index < 0 || index >= columnSize()) {
return null;
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/ByteColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/ByteColumn.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/ByteColumn.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/ByteColumn.java
@@ -21,7 +21,7 @@ public class ByteColumn extends Column<B
}
@Override
- public Byte getVaule(int index) {
+ public Byte getValue(int index) {
if (isNullValue(index) || index < 0 || index >= columnSize()) {
return null;
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/Column.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/Column.java
--- a/java/embedded/src/main/java/org/monetdb/embedded/result/column/Column.java
+++ b/java/embedded/src/main/java/org/monetdb/embedded/result/column/Column.java
@@ -41,7 +41,7 @@ public abstract class Column<T> implemen
* @param index Column index for the value
* @return Value, cloud be {@code null}
*/
- public abstract T getVaule(int index);
+ public abstract T getValue(int index);
/**
* Get the size of a column.
@@ -74,7 +74,7 @@ public abstract class Column<T> implemen
@Override
public T next() {
- return getVaule(currentIndex++);
+ return getValue(currentIndex++);
}
};
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/DoubleColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/DoubleColumn.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/DoubleColumn.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/DoubleColumn.java
@@ -21,7 +21,7 @@ public class DoubleColumn extends Column
}
@Override
- public Double getVaule(int index) {
+ public Double getValue(int index) {
if (isNullValue(index) || index < 0 || index >= columnSize()) {
return null;
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/FloatColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/FloatColumn.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/FloatColumn.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/FloatColumn.java
@@ -21,7 +21,7 @@ public class FloatColumn extends Column<
}
@Override
- public Float getVaule(int index) {
+ public Float getValue(int index) {
if (isNullValue(index) || index < 0 || index >= columnSize()) {
return null;
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/IntegerColumn.java
@@ -21,7 +21,7 @@ public class IntegerColumn extends Colum
}
@Override
- public Integer getVaule(int index) {
+ public Integer getValue(int index) {
if (isNullValue(index) || index < 0 || index >= columnSize()) {
return null;
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/LongColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/LongColumn.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/LongColumn.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/LongColumn.java
@@ -21,7 +21,7 @@ public class LongColumn extends Column<L
}
@Override
- public Long getVaule(int index) {
+ public Long getValue(int index) {
if (isNullValue(index) || index < 0 || index >= columnSize()) {
return null;
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/ShortColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/ShortColumn.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/ShortColumn.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/ShortColumn.java
@@ -21,7 +21,7 @@ public class ShortColumn extends Column<
}
@Override
- public Short getVaule(int index) {
+ public Short getValue(int index) {
if (isNullValue(index) || index < 0 || index >= columnSize()) {
return null;
}
diff --git
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/StringColumn.java
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/StringColumn.java
---
a/java/embedded/src/main/java/org/monetdb/embedded/result/column/StringColumn.java
+++
b/java/embedded/src/main/java/org/monetdb/embedded/result/column/StringColumn.java
@@ -21,7 +21,7 @@ public class StringColumn extends Column
}
@Override
- public String getVaule(int index) {
+ public String getValue(int index) {
return values[index];
}
}
diff --git
a/java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
b/java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
--- a/java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
+++ b/java/embedded/src/test/java/org/monetdb/embedded/test/EmbeddedTest.java
@@ -79,8 +79,8 @@ public class EmbeddedTest {
try (EmbeddedQueryResult result = restartedDB.query("SELECT *
FROM test;")) {
assertEquals(4, result.getColumn(1).columnSize());
- assertEquals(Integer.valueOf(20),
result.getColumn(1).getVaule(1));
- assertEquals(null, result.getColumn(1).getVaule(3));
+ assertEquals(Integer.valueOf(20),
result.getColumn(1).getValue(1));
+ assertEquals(null, result.getColumn(1).getValue(3));
}
}
@@ -100,8 +100,8 @@ public class EmbeddedTest {
public void integerWithNullTest() throws IOException, SQLException {
try (EmbeddedQueryResult result = db.query("SELECT * FROM
test;")) {
assertEquals(4, result.getColumn(1).columnSize());
- assertEquals(Integer.valueOf(20),
result.getColumn(1).getVaule(1));
- assertEquals(null, result.getColumn(1).getVaule(3));
+ assertEquals(Integer.valueOf(20),
result.getColumn(1).getValue(1));
+ assertEquals(null, result.getColumn(1).getValue(3));
}
}
@@ -111,8 +111,8 @@ public class EmbeddedTest {
assertEquals(6, result.getNumberOfColumns());
// byte
- assertEquals(numbericTypeTestValues[2],
result.getColumn("fint").getVaule(0));
- assertEquals(null,
result.getColumn("fint").getVaule(1));
+ assertEquals(numbericTypeTestValues[2],
result.getColumn("fint").getValue(0));
+ assertEquals(null,
result.getColumn("fint").getValue(1));
}
}
@@ -122,23 +122,23 @@ public class EmbeddedTest {
assertEquals(6, result.getNumberOfColumns());
// byte
- assertEquals(numbericTypeTestValues[0],
result.getColumn(0).getVaule(0));
- assertEquals(null, result.getColumn(0).getVaule(1));
+ assertEquals(numbericTypeTestValues[0],
result.getColumn(0).getValue(0));
+ assertEquals(null, result.getColumn(0).getValue(1));
// short
- assertEquals(numbericTypeTestValues[1],
result.getColumn(1).getVaule(0));
- assertEquals(null, result.getColumn(1).getVaule(1));
+ assertEquals(numbericTypeTestValues[1],
result.getColumn(1).getValue(0));
+ assertEquals(null, result.getColumn(1).getValue(1));
// int
- assertEquals(numbericTypeTestValues[2],
result.getColumn(2).getVaule(0));
- assertEquals(null, result.getColumn(2).getVaule(1));
+ assertEquals(numbericTypeTestValues[2],
result.getColumn(2).getValue(0));
+ assertEquals(null, result.getColumn(2).getValue(1));
// long
- assertEquals(numbericTypeTestValues[3],
result.getColumn(3).getVaule(0));
- assertEquals(null, result.getColumn(3).getVaule(1));
+ assertEquals(numbericTypeTestValues[3],
result.getColumn(3).getValue(0));
+ assertEquals(null, result.getColumn(3).getValue(1));
// float
- assertEquals(numbericTypeTestValues[4],
result.getColumn(4).getVaule(0));
- assertEquals(null, result.getColumn(4).getVaule(1));
+ assertEquals(numbericTypeTestValues[4],
result.getColumn(4).getValue(0));
+ assertEquals(null, result.getColumn(4).getValue(1));
// double
- assertEquals(numbericTypeTestValues[5],
result.getColumn(5).getVaule(0));
- assertEquals(null, result.getColumn(5).getVaule(1));
+ assertEquals(numbericTypeTestValues[5],
result.getColumn(5).getValue(0));
+ assertEquals(null, result.getColumn(5).getValue(1));
}
}
@@ -147,10 +147,10 @@ public class EmbeddedTest {
try (EmbeddedQueryResult result = db.query("SELECT * FROM
char_types_test;")) {
assertEquals(2, result.getNumberOfColumns());
- assertEquals(charTypeTestValues[0],
result.getColumn(0).getVaule(0));
- assertEquals(charTypeTestValues[0],
result.getColumn(1).getVaule(0));
- assertEquals("", result.getColumn(0).getVaule(1));
- assertEquals("", result.getColumn(1).getVaule(1));
+ assertEquals(charTypeTestValues[0],
result.getColumn(0).getValue(0));
+ assertEquals(charTypeTestValues[0],
result.getColumn(1).getValue(0));
+ assertEquals("", result.getColumn(0).getValue(1));
+ assertEquals("", result.getColumn(1).getValue(1));
}
}
@@ -159,9 +159,9 @@ public class EmbeddedTest {
try (EmbeddedQueryResult result = db.query("SELECT * FROM
boolean_types_test;")) {
assertEquals(1, result.getNumberOfColumns());
- assertEquals(booleanTypeTestValues[0],
result.getColumn(0).getVaule(0));
- assertEquals(booleanTypeTestValues[1],
result.getColumn(0).getVaule(1));
- assertEquals(null, result.getColumn(0).getVaule(2));
+ assertEquals(booleanTypeTestValues[0],
result.getColumn(0).getValue(0));
+ assertEquals(booleanTypeTestValues[1],
result.getColumn(0).getValue(1));
+ assertEquals(null, result.getColumn(0).getValue(2));
}
}
@@ -169,16 +169,16 @@ public class EmbeddedTest {
public void twoQueries() throws SQLException {
EmbeddedQueryResult result1 = db.query("SELECT * FROM test
WHERE id > 1;");
assertEquals(2, result1.getColumn(1).columnSize());
- assertEquals(Integer.valueOf(30),
result1.getColumn(1).getVaule(0));
- assertEquals(null, result1.getColumn(1).getVaule(1));
+ assertEquals(Integer.valueOf(30),
result1.getColumn(1).getValue(0));
+ assertEquals(null, result1.getColumn(1).getValue(1));
EmbeddedQueryResult result2 = db.query("SELECT * FROM test
WHERE id < 1;");
assertEquals(1, result2.getColumn(1).columnSize());
- assertEquals(Integer.valueOf(10),
result2.getColumn(1).getVaule(0));
+ assertEquals(Integer.valueOf(10),
result2.getColumn(1).getValue(0));
assertEquals(2, result1.getColumn(1).columnSize());
- assertEquals(Integer.valueOf(30),
result1.getColumn(1).getVaule(0));
- assertEquals(null, result1.getColumn(1).getVaule(1));
+ assertEquals(Integer.valueOf(30),
result1.getColumn(1).getValue(0));
+ assertEquals(null, result1.getColumn(1).getValue(1));
}
@Test
@@ -186,8 +186,8 @@ public class EmbeddedTest {
@SuppressWarnings("resource")
EmbeddedQueryResult result = db.query("SELECT * FROM test;");
assertEquals(4, result.getColumn(1).columnSize());
- assertEquals(Integer.valueOf(20),
result.getColumn(1).getVaule(1));
- assertEquals(null, result.getColumn(1).getVaule(3));
+ assertEquals(Integer.valueOf(20),
result.getColumn(1).getValue(1));
+ assertEquals(null, result.getColumn(1).getValue(3));
result.close();
}
@@ -210,8 +210,8 @@ public class EmbeddedTest {
try (EmbeddedQueryResult result = newDB.query("SELECT * FROM
world;")) {
assertEquals(4, result.getColumn(1).columnSize());
- assertEquals(Integer.valueOf(20),
result.getColumn(1).getVaule(1));
- assertEquals(null, result.getColumn(1).getVaule(3));
+ assertEquals(Integer.valueOf(20),
result.getColumn(1).getValue(1));
+ assertEquals(null, result.getColumn(1).getValue(3));
}
}
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
