From 8f67d0abb45449d94edb37c283d79c9bc2e70c01 Mon Sep 17 00:00:00 2001
From: Francesco <francesco@menzani.eu>
Date: Wed, 3 Mar 2021 09:29:29 +0100
Subject: [PATCH] feat(maven): Make output directory configurable (#835)

---
 benchmarks/pom.xml                                          | 2 ++
 core/pom.xml                                                | 3 +++
 core/src/main/java/io/questdb/cairo/sql/InsertMethod.java   | 4 +++-
 core/src/main/java/io/questdb/cairo/sql/VirtualRecord.java  | 2 +-
 .../java/io/questdb/cutlass/pgwire/PGConnectionContext.java | 2 +-
 core/src/main/java/io/questdb/griffin/SqlCompiler.java      | 3 ++-
 core/src/main/java/io/questdb/std/Unsafe.java               | 6 ++----
 core/src/test/java/io/questdb/cairo/TableWriterTest.java    | 2 +-
 core/src/test/java/io/questdb/griffin/CopyTest.java         | 6 +++---
 9 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
index 015506c6c..148c3bed8 100644
--- a/benchmarks/pom.xml
+++ b/benchmarks/pom.xml
@@ -68,6 +68,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <benchmarks.outputPath>target</benchmarks.outputPath>
 
         <!--
             JMH version to use with this project.
@@ -86,6 +87,7 @@
     </properties>
 
     <build>
+        <directory>${benchmarks.outputPath}</directory>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index fe52960c0..8131c8f34 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -30,6 +30,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <outputPath>target</outputPath>
         <nodejs.npm.cmd>npm</nodejs.npm.cmd>
         <nodejs.version>v12.16.2</nodejs.version>
         <runtime.assembly>none</runtime.assembly>
@@ -76,6 +77,7 @@
     </distributionManagement>
 
     <build>
+        <directory>${outputPath}</directory>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -157,6 +159,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>
diff --git a/core/src/main/java/io/questdb/cairo/sql/InsertMethod.java b/core/src/main/java/io/questdb/cairo/sql/InsertMethod.java
index 36c62ebf8..eeaf8b780 100644
--- a/core/src/main/java/io/questdb/cairo/sql/InsertMethod.java
+++ b/core/src/main/java/io/questdb/cairo/sql/InsertMethod.java
@@ -29,7 +29,9 @@ import io.questdb.cairo.TableWriter;
 import java.io.Closeable;
 
 public interface InsertMethod extends Closeable {
-    // return inserted row count
+    /**
+     * @return inserted row count
+     */
     long execute();
 
     void commit();
diff --git a/core/src/main/java/io/questdb/cairo/sql/VirtualRecord.java b/core/src/main/java/io/questdb/cairo/sql/VirtualRecord.java
index 2236177f5..60b54fc72 100644
--- a/core/src/main/java/io/questdb/cairo/sql/VirtualRecord.java
+++ b/core/src/main/java/io/questdb/cairo/sql/VirtualRecord.java
@@ -161,7 +161,7 @@ public class VirtualRecord implements ColumnTypes, DelegatingRecord {
 
     @Override
     public int getColumnType(int columnIndex) {
-        return functions.getQuick(columnIndex).getType();
+        return getFunction(columnIndex).getType();
     }
 
     public ObjList<? extends Function> getFunctions() {
diff --git a/core/src/main/java/io/questdb/cutlass/pgwire/PGConnectionContext.java b/core/src/main/java/io/questdb/cutlass/pgwire/PGConnectionContext.java
index b77519ff2..d1fc070b4 100644
--- a/core/src/main/java/io/questdb/cutlass/pgwire/PGConnectionContext.java
+++ b/core/src/main/java/io/questdb/cutlass/pgwire/PGConnectionContext.java
@@ -1707,7 +1707,7 @@ public class PGConnectionContext implements IOContext, Mutable, WriterSource {
                         this.username = e.toImmutable();
                     }
 
-                    LOG.info().$("propertry [name=").$(dbcs.of(nameLo, nameHi)).$(", value=").$(dbcs.of(valueLo, valueHi)).$(']').$();
+                    LOG.info().$("property [name=").$(dbcs.of(nameLo, nameHi)).$(", value=").$(dbcs.of(valueLo, valueHi)).$(']').$();
                 }
 
                 characterStore.clear();
diff --git a/core/src/main/java/io/questdb/griffin/SqlCompiler.java b/core/src/main/java/io/questdb/griffin/SqlCompiler.java
index 966f45057..4def237de 100644
--- a/core/src/main/java/io/questdb/griffin/SqlCompiler.java
+++ b/core/src/main/java/io/questdb/griffin/SqlCompiler.java
@@ -1761,7 +1761,8 @@ public class SqlCompiler implements Closeable {
             throw SqlException.$(tableName.position, "literal expected");
         }
 
-        if (model.getColumnSet().size() > 0 && model.getColumnSet().size() != model.getColumnValues().size()) {
+        int columnSetSize = model.getColumnSet().size();
+        if (columnSetSize > 0 && columnSetSize != model.getColumnValues().size()) {
             throw SqlException.$(model.getColumnPosition(0), "value count does not match column count");
         }
 
diff --git a/core/src/main/java/io/questdb/std/Unsafe.java b/core/src/main/java/io/questdb/std/Unsafe.java
index b1422adfe..99ffd7ea5 100644
--- a/core/src/main/java/io/questdb/std/Unsafe.java
+++ b/core/src/main/java/io/questdb/std/Unsafe.java
@@ -100,11 +100,9 @@ public final class Unsafe {
 
     public static long getFieldOffset(Class<?> clazz, String name) {
         try {
-            Field f = clazz.getDeclaredField(name);
-//            f.setAccessible(true);
-            return UNSAFE.objectFieldOffset(f);
+            return UNSAFE.objectFieldOffset(clazz.getDeclaredField(name));
         } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
+            throw new ExceptionInInitializerError(e);
         }
     }
 
diff --git a/core/src/test/java/io/questdb/cairo/TableWriterTest.java b/core/src/test/java/io/questdb/cairo/TableWriterTest.java
index 02670cf96..bb39c5ec0 100644
--- a/core/src/test/java/io/questdb/cairo/TableWriterTest.java
+++ b/core/src/test/java/io/questdb/cairo/TableWriterTest.java
@@ -1747,7 +1747,7 @@ public class TableWriterTest extends AbstractCairoTest {
         populateTable(new FilesFacadeImpl() {
             @Override
             public long getPageSize() {
-                return super.getPageSize() * super.getPageSize();
+                return super.getPageSize() * 500;
             }
         }, PartitionBy.MONTH);
     }
diff --git a/core/src/test/java/io/questdb/griffin/CopyTest.java b/core/src/test/java/io/questdb/griffin/CopyTest.java
index 0c9bb2360..9014679d4 100644
--- a/core/src/test/java/io/questdb/griffin/CopyTest.java
+++ b/core/src/test/java/io/questdb/griffin/CopyTest.java
@@ -435,7 +435,7 @@ public class CopyTest extends AbstractCairoTest {
     public void testSimpleCopy() throws Exception {
         assertMemoryLeak(() -> {
 
-            compiler.compile("copy x from '/target/test-classes/csv/test-import.csv'", sqlExecutionContext);
+            compiler.compile("copy x from '/src/test/resources/csv/test-import.csv'", sqlExecutionContext);
 
             final String expected = "StrSym\tIntSym\tIntCol\tDoubleCol\tIsoDate\tFmt1Date\tFmt2Date\tPhone\tboolean\tlong\n" +
                     "CMP1\t1\t6992\t2.12060110410675\t2015-01-05T19:15:09.000Z\t2015-01-05T19:15:09.000Z\t2015-01-05T00:00:00.000Z\t6992\ttrue\t4952743\n" +
@@ -581,7 +581,7 @@ public class CopyTest extends AbstractCairoTest {
     public void testSimpleCopyForceHeader() throws Exception {
         assertMemoryLeak(() -> {
 
-            compiler.compile("copy x from '/target/test-classes/csv/test-numeric-headers.csv' with header true", sqlExecutionContext);
+            compiler.compile("copy x from '/src/test/resources/csv/test-numeric-headers.csv' with header true", sqlExecutionContext);
 
             final String expected = "type\tvalue\tactive\tdesc\t_1\n" +
                     "ABC\txy\ta\tbrown fox jumped over the fence\t10\n" +
@@ -601,7 +601,7 @@ public class CopyTest extends AbstractCairoTest {
     public void testSimpleCopyForceHeader2() throws Exception {
         assertMemoryLeak(() -> {
 
-            compiler.compile("copy x from '/target/test-classes/csv/test-numeric-headers.csv' with header false", sqlExecutionContext);
+            compiler.compile("copy x from '/src/test/resources/csv/test-numeric-headers.csv' with header false", sqlExecutionContext);
 
             final String expected = "f0\tf1\tf2\tf3\tf4\n" +
                     "type\tvalue\tactive\tdesc\t1\n" +
-- 
GitLab