提交 2bc541a0 authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov

Fix long lines and whitespace

上级 905e5fb6
...@@ -1504,7 +1504,7 @@ public class Function extends Expression implements FunctionCall { ...@@ -1504,7 +1504,7 @@ public class Function extends Expression implements FunctionCall {
if (field != EPOCH) { if (field != EPOCH) {
result = ValueInt.get(getIntDatePart(v1, field)); result = ValueInt.get(getIntDatePart(v1, field));
} else { } else {
// Case where we retrieve the EPOCH time. // Case where we retrieve the EPOCH time.
// First we retrieve the dateValue and his time in nanoseconds. // First we retrieve the dateValue and his time in nanoseconds.
long[] a = DateTimeUtils.dateAndTimeFromValue(v1); long[] a = DateTimeUtils.dateAndTimeFromValue(v1);
...@@ -1515,37 +1515,40 @@ public class Function extends Expression implements FunctionCall { ...@@ -1515,37 +1515,40 @@ public class Function extends Expression implements FunctionCall {
BigDecimal numberOfDays = new BigDecimal(DateTimeUtils.absoluteDayFromDateValue(dateValue)); BigDecimal numberOfDays = new BigDecimal(DateTimeUtils.absoluteDayFromDateValue(dateValue));
BigDecimal nanosSeconds = new BigDecimal(1_000_000_000); BigDecimal nanosSeconds = new BigDecimal(1_000_000_000);
BigDecimal secondsPerDay = new BigDecimal(DateTimeUtils.SECONDS_PER_DAY); BigDecimal secondsPerDay = new BigDecimal(DateTimeUtils.SECONDS_PER_DAY);
// Case where the value is of type time e.g. '10:00:00' // Case where the value is of type time e.g. '10:00:00'
if (v1 instanceof ValueTime) { if (v1 instanceof ValueTime) {
// In order to retrieve the EPOCH time we only have to convert the time // In order to retrieve the EPOCH time we only have to convert the time
// in nanoseconds (previously retrieved) in seconds. // in nanoseconds (previously retrieved) in seconds.
result = ValueDecimal.get(timeNanosBigDecimal.divide(nanosSeconds)); result = ValueDecimal.get(timeNanosBigDecimal.divide(nanosSeconds));
} else if (v1 instanceof ValueDate) { } else if (v1 instanceof ValueDate) {
// Case where the value is of type date '2000:01:01', we have to retrieve the total // Case where the value is of type date '2000:01:01', we have to retrieve the
// number of days and multiply it by the number of seconds in a day. // total number of days and multiply it by the number of seconds in a day.
result = ValueDecimal.get(numberOfDays.multiply(secondsPerDay)); result = ValueDecimal.get(numberOfDays.multiply(secondsPerDay));
} else if (v1 instanceof ValueTimestampTimeZone) { } else if (v1 instanceof ValueTimestampTimeZone) {
// Case where the value is a of type ValueTimestampTimeZone ('2000:01:01 10:00:00+05). // Case where the value is a of type ValueTimestampTimeZone
// We retrieve the time zone offset in minute // ('2000:01:01 10:00:00+05').
// We retrieve the time zone offset in minutes
ValueTimestampTimeZone v = (ValueTimestampTimeZone) v1; ValueTimestampTimeZone v = (ValueTimestampTimeZone) v1;
BigDecimal timeZoneOffsetSeconds = new BigDecimal(v.getTimeZoneOffsetMins() * 60); BigDecimal timeZoneOffsetSeconds = new BigDecimal(v.getTimeZoneOffsetMins() * 60);
// Sum the time in nanoseconds and the total number of days in seconds // Sum the time in nanoseconds and the total number of days in seconds
// and adding the timeZone offset in seconds. // and adding the timeZone offset in seconds.
result = ValueDecimal.get(timeNanosBigDecimal.divide(nanosSeconds) result = ValueDecimal.get(timeNanosBigDecimal.divide(nanosSeconds)
.add(numberOfDays.multiply(secondsPerDay)) .add(numberOfDays.multiply(secondsPerDay)).subtract(timeZoneOffsetSeconds));
.subtract(timeZoneOffsetSeconds));
} else { } else {
// By default, we have the date and the time ('2000:01:01 10:00:00) if no type is given. // By default, we have the date and the time ('2000:01:01 10:00:00') if no type
// We just have to sum the time in nanoseconds and the total number of days in seconds. // is given.
result = ValueDecimal.get(timeNanosBigDecimal.divide(nanosSeconds).add(numberOfDays.multiply(secondsPerDay))); // We just have to sum the time in nanoseconds and the total number of days in
// seconds.
result = ValueDecimal
.get(timeNanosBigDecimal.divide(nanosSeconds).add(numberOfDays.multiply(secondsPerDay)));
} }
} }
break; break;
......
...@@ -1615,7 +1615,7 @@ public class MetaTable extends Table { ...@@ -1615,7 +1615,7 @@ public class MetaTable extends Table {
if (constraintType == Constraint.Type.CHECK) { if (constraintType == Constraint.Type.CHECK) {
checkExpression = ((ConstraintCheck) constraint).getExpression().getSQL(); checkExpression = ((ConstraintCheck) constraint).getExpression().getSQL();
} else if (constraintType == Constraint.Type.UNIQUE || } else if (constraintType == Constraint.Type.UNIQUE ||
constraintType == Constraint.Type.PRIMARY_KEY) { constraintType == Constraint.Type.PRIMARY_KEY) {
indexColumns = ((ConstraintUnique) constraint).getColumns(); indexColumns = ((ConstraintUnique) constraint).getColumns();
} else if (constraintType == Constraint.Type.REFERENTIAL) { } else if (constraintType == Constraint.Type.REFERENTIAL) {
indexColumns = ((ConstraintReferential) constraint).getColumns(); indexColumns = ((ConstraintReferential) constraint).getColumns();
......
...@@ -224,7 +224,8 @@ public class ChangeFileEncryption extends Tool { ...@@ -224,7 +224,8 @@ public class ChangeFileEncryption extends Tool {
try (FileChannel fileIn = getFileChannel(fileName, "r", decryptKey)){ try (FileChannel fileIn = getFileChannel(fileName, "r", decryptKey)){
try(InputStream inStream = new FileChannelInputStream(fileIn, true)) { try(InputStream inStream = new FileChannelInputStream(fileIn, true)) {
FileUtils.delete(temp); FileUtils.delete(temp);
try (OutputStream outStream = new FileChannelOutputStream(getFileChannel(temp, "rw", encryptKey), true)) { try (OutputStream outStream = new FileChannelOutputStream(getFileChannel(temp, "rw", encryptKey),
true)) {
byte[] buffer = new byte[4 * 1024]; byte[] buffer = new byte[4 * 1024];
long remaining = fileIn.size(); long remaining = fileIn.size();
long total = remaining; long total = remaining;
......
...@@ -36,7 +36,7 @@ public class DateTimeUtils { ...@@ -36,7 +36,7 @@ public class DateTimeUtils {
* The number of milliseconds per day. * The number of milliseconds per day.
*/ */
public static final long MILLIS_PER_DAY = 24 * 60 * 60 * 1000L; public static final long MILLIS_PER_DAY = 24 * 60 * 60 * 1000L;
/** /**
* The number of seconds per day. * The number of seconds per day.
*/ */
......
...@@ -466,16 +466,16 @@ public abstract class TestBase { ...@@ -466,16 +466,16 @@ public abstract class TestBase {
throw new AssertionError(string); throw new AssertionError(string);
} }
/** /**
* Log an error message. * Log an error message.
* *
* @param s the message * @param s the message
*/ */
public static void logErrorMessage(String s) { public static void logErrorMessage(String s) {
System.out.flush(); System.out.flush();
System.err.println("ERROR: " + s + "------------------------------"); System.err.println("ERROR: " + s + "------------------------------");
logThrowable(s, null); logThrowable(s, null);
} }
/** /**
* Log an error message. * Log an error message.
......
...@@ -92,7 +92,7 @@ public class TestScript extends TestBase { ...@@ -92,7 +92,7 @@ public class TestScript extends TestBase {
} else { } else {
decimal2 = "decimal_numeric"; decimal2 = "decimal_numeric";
} }
for (String s : new String[] { "array", "bigint", "binary", "blob", for (String s : new String[] { "array", "bigint", "binary", "blob",
"boolean", "char", "clob", "date", "decimal", decimal2, "double", "enum", "boolean", "char", "clob", "date", "decimal", decimal2, "double", "enum",
"geometry", "identity", "int", "other", "real", "smallint", "geometry", "identity", "int", "other", "real", "smallint",
......
...@@ -119,7 +119,7 @@ public class TestFuzzOptimizations extends TestBase { ...@@ -119,7 +119,7 @@ public class TestFuzzOptimizations extends TestBase {
} }
} }
executeAndCompare("a >=0 and b in(?, 2) and a in(1, ?, null)", Arrays.asList("10", "2"), executeAndCompare("a >=0 and b in(?, 2) and a in(1, ?, null)", Arrays.asList("10", "2"),
"seed=-6191135606105920350L"); "seed=-6191135606105920350L");
db.execute("drop table test0, test1"); db.execute("drop table test0, test1");
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论