From 2f16e5f0b9c1f2cb8bc9ad263df9cc3002b2bbf5 Mon Sep 17 00:00:00 2001
From: Elia Porciani <e.porciani@sease.io>
Date: Wed, 29 Jul 2020 12:44:27 +0200
Subject: [PATCH] SEARCH-2317: Add support of nested queries (#833)

* [SEARCH-2317]
- date field substitutions in nested and join queries
- optimized code with the use of streams

* [SEARCH-2317]
code refactoring

* [SEARCH-2317]
Added unit tests

* [SEARCH-2317]
fixed broken tests

* [SEARCH-2317]
removed duplicated test

* SEARCH-2317 Adding e2e-test coverage for date filter fields

* [SEARCH-2317]
initial work on translation of timestamp in having clause

* [SEARCH-2317]
update calcite to 1.15

* [SEARCH-2317]
- timestamp tranlation into long value
- fix aliasing in nested queries

* [SEARCH-2317]
add test for timestamp translation

* [SEARCH-2317]
downgrade calcite to 1.13

* [SEARCH-2317]
fix error in complex where clauses

* [SEARCH-2317]
Coder refactoring.
Updated notice.txt with the new version of calcite and avatica

* [SEARCH-2317]
fix E2E tests

* [SEARCH-2317]
Managed group by buckets with no fields defined.

* [SEARCH-2317]
Added e2e tests

* [SEARCH-2317]
modified tuple values from NaN to 0 at retrieving time

* [SEARCH-2317]
- Fix tests accoring with new aggregation results (0 instead of NaN)
- Added e2e tests

* [SEARCH-2317]
fixed test

* [SEARCH-2317]
translated date into epoch in comparison with aggregate functions

* [SEARCH-2317]
fix wrong number of results in test

* [SEARCH-2317]
added sql date to epoch translation in having clause

* [SEARCH-2317]
Fix indentations

* [SEARCH-2317]
date are converted from UTC into epoch

Co-authored-by: Keerat <keerat.lalia@alfresco.com>
---
 search-services/alfresco-search/pom.xml              | 12 +++++++++---
 .../packaging/src/main/resources/licenses/notice.txt |  6 ++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/search-services/alfresco-search/pom.xml b/search-services/alfresco-search/pom.xml
index 349e30afa..ae60aa88a 100644
--- a/search-services/alfresco-search/pom.xml
+++ b/search-services/alfresco-search/pom.xml
@@ -158,18 +158,24 @@
         </dependency>
 
 		<!-- DATE Functions (YEAR, MONTH, ...) are broken in Calcite 1.11.0 (default 
-			version provided by SOLR 6.6.x) Upgrading manually Calcite version to 1.12.0 
+			version provided by SOLR 6.6.x)
+			Upgrading manually Calcite version to 1.15.0
 			to support this kind of functions -->
 		<dependency>
 			<groupId>org.apache.calcite</groupId>
 			<artifactId>calcite-core</artifactId>
-			<version>1.12.0</version>
+			<version>1.13.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.calcite</groupId>
 			<artifactId>calcite-linq4j</artifactId>
-			<version>1.12.0</version>
+			<version>1.13.0</version>
 		</dependency>
+        <dependency>
+            <groupId>org.apache.calcite.avatica</groupId>
+            <artifactId>avatica-core</artifactId>
+            <version>1.13.0</version>
+        </dependency>
 
         <!-- Test dependencies -->
         <dependency>
diff --git a/search-services/packaging/src/main/resources/licenses/notice.txt b/search-services/packaging/src/main/resources/licenses/notice.txt
index 2163dc37b..d3bafbe0e 100644
--- a/search-services/packaging/src/main/resources/licenses/notice.txt
+++ b/search-services/packaging/src/main/resources/licenses/notice.txt
@@ -124,8 +124,10 @@ bcmail-jdk15on-1.47.jar
 bcprov-jdk15on-1.47.jar
 boilerpipe-1.1.0.jar
 caffeine-2.4.0.jar
-calcite-core-1.12.0.jar
-calcite-linq4j-1.12.0.jar
+calcite-core-1.13.0.jar
+calcite-linq4j-1.13.0.jar
+avatica-core-1.13.0.jar
+avatica-metrics-1.13.0.jar
 carrot2-guava-18.0.jar
 carrot2-mini-3.15.0.jar
 commons-cli-1.2.jar