Cb 4457 subcollections firestore

server/bundles/io.cloudbeaver.server/schema/service.sql.graphqls

@@ -93,6 +93,11 @@ type SQLResultColumn {
     supportedOperations: [DataTypeLogicalOperation!]!
 }
 
+type SQLResultRowMetaData {
+    data: [Object]
+    metaData: Object
+}
+
 type DatabaseDocument {
     id: String
     contentType: String
@@ -103,7 +108,8 @@ type DatabaseDocument {
 type SQLResultSet {
     id: ID!
     columns: [ SQLResultColumn ]
-    rows: [ [ Object ] ]
+    rows: [ [ Object ] ] @deprecated
+    rowsWithMetaData: [SQLResultRowMetaData]
 
     # True means that resultset was generated by single entity query
     # New rows can be added, old rows can be deleted
@@ -112,6 +118,7 @@ type SQLResultSet {
     hasMoreData: Boolean!
     # can't update data or load LOB file if hasRowIdentifier = false
     hasRowIdentifier: Boolean!
+    hasChildrenCollection: Boolean!
 }
 
 type SQLQueryResults {
@@ -146,6 +153,11 @@ input SQLResultRow {
     updateValues: Object
 }
 
+input SQLResultRowMetaDataInput {
+    data: [Object]
+    metaData: Object!
+}
+
 type DataTypeLogicalOperation {
     id: ID!
     expression: String!
@@ -304,6 +316,17 @@ extend type Mutation {
         dataFormat: ResultDataFormat
     ): AsyncTaskInfo!
 
+    # Read data from subcollection
+    asyncReadDataFromChildEntity(
+        projectId: ID,
+        connectionId: ID!,
+        contextId: ID!,
+        path: ID,
+        resultId: ID,
+        filter: SQLDataFilter,
+        dataFormat: ResultDataFormat
+    ): AsyncTaskInfo!
+
     # Close results (free resources)
     sqlResultClose(projectId: ID, connectionId: ID!, contextId: ID!, resultId: ID!): Boolean!
 
@@ -386,4 +409,5 @@ extend type Mutation {
     ): AsyncTaskInfo!
 
     asyncSqlRowDataCountResult(taskId: ID!): Int!
+
 }

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/DBWServiceSQL.java

@@ -106,6 +106,14 @@
         @Nullable WebSQLDataFilter filter,
         @Nullable WebDataFormat dataFormat) throws DBWebException;
 
+    @WebAction
+    WebAsyncTaskInfo asyncReadDataFromChildEntity(
+            @NotNull WebSQLContextInfo contextInfo,
+            @NotNull String path,
+            @Nullable String resultId,
+            @Nullable WebSQLDataFilter filter,
+            @Nullable WebDataFormat dataFormat) throws DBWebException;
+
     @WebAction
     Boolean closeResult(@NotNull WebSQLContextInfo sqlContext, @NotNull String resultId) throws DBWebException;
 

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLProcessor.java

@@ -28,6 +28,7 @@
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.DBCHierarchicalDocumentProvider;
 import org.jkiss.dbeaver.model.DBPDataKind;
 import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.DBUtils;
@@ -331,7 +332,7 @@
     {
         // we don't need to add same row several times
         // (it can be when we update the row from RS with several tables)
-        Set<Object[]> newResultSetRows = new LinkedHashSet<>();
+        Set<WebSQLQueryResultSetRow> newResultSetRows = new LinkedHashSet<>();
         KeyDataReceiver keyReceiver = new KeyDataReceiver(contextInfo.getResults(resultsId));
         WebSQLResultsInfo resultsInfo = contextInfo.getResults(resultsId);
 
@@ -372,7 +373,7 @@
 
                         totalUpdateCount += statistics.getRowsUpdated();
                         result.setDuration(result.getDuration() + statistics.getExecuteTime());
-                        newResultSetRows.add(rowValues);
+                        newResultSetRows.add(new WebSQLQueryResultSetRow(rowValues, null));
                     }
 
                     if (txnManager != null && txnManager.isSupportsTransactions()) {
@@ -399,7 +400,7 @@
         WebSQLQueryResults updateResults = new WebSQLQueryResults(webSession, dataFormat);
         updateResults.setUpdateRowCount(totalUpdateCount);
         updateResults.setResultSet(updatedResultSet);
-        updatedResultSet.setRows(newResultSetRows.toArray(new Object[0][]));
+        updatedResultSet.setRows(List.of(newResultSetRows.toArray(new WebSQLQueryResultSetRow[0])));
 
         queryResults.add(updateResults);
 
@@ -410,7 +411,7 @@
 
     private void getUpdatedRowsInfo(
         @NotNull WebSQLResultsInfo resultsInfo,
-        @NotNull Set<Object[]> newResultSetRows,
+        @NotNull Set<WebSQLQueryResultSetRow> newResultSetRows,
         @Nullable WebDataFormat dataFormat,
         @NotNull DBRProgressMonitor monitor)
         throws DBCException {
@@ -420,8 +421,8 @@
             "Refresh row(s) after insert/update")
         ) {
             boolean canRefreshResults = resultsInfo.canRefreshResults();
-            for (Object[] row : newResultSetRows) {
-                if (row.length == 0) {
+            for (WebSQLQueryResultSetRow row : newResultSetRows) {
+                if (row.getData().length == 0) {
                     continue;
                 }
                 if (!canRefreshResults) {
@@ -438,7 +439,7 @@
                     if (attr.getRowIdentifier() == null) {
                         continue;
                     }
-                    final Object keyValue = row[attr.getOrdinalPosition()];
+                    final Object keyValue = row.getData()[attr.getOrdinalPosition()];
                     if (DBUtils.isNullValue(keyValue)) {
                         hasKey = false;
                         break;
@@ -455,7 +456,7 @@
                 }
                 DBDDataFilter filter = new DBDDataFilter(constraints);
                 DBSDataContainer dataContainer = resultsInfo.getDataContainer();
-                WebRowDataReceiver dataReceiver = new WebRowDataReceiver(resultsInfo.getAttributes(), row, dataFormat);
+                WebRowDataReceiver dataReceiver = new WebRowDataReceiver(resultsInfo.getAttributes(), row.getData(), dataFormat);
                 dataContainer.readData(
                     new AbstractExecutionSource(dataContainer, getExecutionContext(dataContainer), this),
                     session,
@@ -471,14 +472,14 @@
 
     private void makeWebCellRow(
         @NotNull WebSQLResultsInfo resultsInfo,
-        @NotNull Object[] row,
+        @NotNull WebSQLQueryResultSetRow row,
         @Nullable WebDataFormat dataFormat
     ) throws DBCException {
-        for (int i = 0; i < row.length; i++) {
-            row[i] = WebSQLUtils.makeWebCellValue(
+        for (int i = 0; i < row.getData().length; i++) {
+            row.getData()[i] = WebSQLUtils.makeWebCellValue(
                 webSession,
                 resultsInfo.getAttributeByPosition(i),
-                row[i],
+                row.getData()[i],
                 dataFormat);
         }
     }
@@ -563,10 +564,16 @@
                     Map<String, Object> updateValues = row.getUpdateValues().entrySet().stream()
                         .filter(x -> CommonUtils.equalObjects(allAttributes[CommonUtils.toInt(x.getKey())].getRowIdentifier(), rowIdentifier))
                         .collect(HashMap::new, (m,v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
+
+                    Map<String, Object> metaData = row.getMetaData().entrySet().stream()
+                            .filter(x -> CommonUtils.equalObjects(allAttributes[CommonUtils.toInt(x.getKey())].getRowIdentifier(), rowIdentifier))
+                            .collect(HashMap::new, (m,v) -> m.put(v.getKey(), v.getValue()), HashMap::putAll);
+
                     if (finalRow.length == 0 || CommonUtils.isEmpty(updateValues)) {
                         continue;
                     }
                     DBDAttributeBinding[] updateAttributes = new DBDAttributeBinding[updateValues.size()];
+                    DBDAttributeBinding[] metaDataAttributes = new DBDAttributeBinding[metaData.size()];
                     // Final row is what we return back
 
                     int index = 0;
@@ -575,6 +582,11 @@
                         updateAttributes[index++] = allAttributes[attrIndex];
                     }
 
+                    for (String indexStr : metaData.keySet()) {
+                        int attrIndex = CommonUtils.toInt(indexStr, -1);
+                        metaDataAttributes[index++] = allAttributes[attrIndex];
+                    }
+
                     Object[] rowValues = new Object[updateAttributes.length + keyAttributes.length];
                     // put key values first in case of updating them
                     for (int i = 0; i < keyAttributes.length; i++) {
@@ -897,6 +909,37 @@
         return type.cast(object);
     }
 
+    public List<?> transformChildSubCollectionValue(
+            @NotNull WebSQLResultsInfo resultsInfo,
+            @NotNull WebSQLResultsRow value
+    ) throws DBException {
+        DBSDataContainer dataContainer = resultsInfo.getDataContainer();
+            if (dataContainer.getDataSource() instanceof DBCHierarchicalDocumentProvider documentProvider) {
+                return (List<?>) documentProvider
+                        .listChildrenEntities((String) Objects.requireNonNull(value.getMetaData()).get("path"),
+                                getWebSession().getProgressMonitor(),
+                                true);
+            } else {
+                throw new DBException("Attribute value is not a subcollection");
+            }
+    }
+
+    public DBSEntity getChildEntity(
+            @NotNull WebSQLResultsInfo resultsInfo,
+            @NotNull WebSQLResultsRow value
+    ) throws DBException {
+        DBSDataContainer dataContainer = resultsInfo.getDataContainer();
+        if (dataContainer.getDataSource() instanceof DBCHierarchicalDocumentProvider documentProvider) {
+            return documentProvider
+                    .getChildrenEntityInstance((String) Objects.requireNonNull(value.getMetaData()).get("path"),
+                            getWebSession().getProgressMonitor(),
+                            true, true);
+        } else {
+            throw new DBException("Attribute value is not a subcollection");
+        }
+    }
+
+
 
     private void fillQueryResults(
         @NotNull WebSQLContextInfo contextInfo,

server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/sql/WebSQLQueryDataReceiver.java

@@ -25,13 +25,15 @@
 import org.jkiss.dbeaver.model.data.*;
 import org.jkiss.dbeaver.model.exec.*;
 import org.jkiss.dbeaver.model.impl.data.DBDValueError;
+import org.jkiss.dbeaver.model.meta.MetaData;
 import org.jkiss.dbeaver.model.sql.DBQuotaException;
 import org.jkiss.dbeaver.model.struct.DBSDataContainer;
 import org.jkiss.dbeaver.model.struct.DBSEntity;
 import org.jkiss.utils.CommonUtils;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.reflect.Method;
+import java.util.*;
+import java.util.stream.Collectors;
 
 class WebSQLQueryDataReceiver implements DBDDataReceiver {
     private static final Log log = Log.getLog(WebSQLQueryDataReceiver.class);
@@ -42,7 +44,7 @@
     private final WebSQLQueryResultSet webResultSet = new WebSQLQueryResultSet();
 
     private DBDAttributeBinding[] bindings;
-    private List<Object[]> rows = new ArrayList<>();
+    private List<WebSQLQueryResultSetRow> rows = new ArrayList<>();
     private final Number rowLimit;
 
     WebSQLQueryDataReceiver(WebSQLContextInfo contextInfo, DBSDataContainer dataContainer, WebDataFormat dataFormat) {
@@ -70,6 +72,7 @@
     @Override
     public void fetchRow(DBCSession session, DBCResultSet resultSet) throws DBCException {
 
+        Map<String, Object> metaDataMap = null;
         Object[] row = new Object[bindings.length];
 
         for (int i = 0; i < bindings.length; i++) {
@@ -81,12 +84,23 @@
                     binding.getMetaAttribute(),
                     i);
                 row[i] = cellValue;
+                Method[] methods = Objects.requireNonNull(cellValue).getClass().getMethods();
+                for (Method method : methods) {
+                    if (method.isAnnotationPresent(MetaData.class)){
+                        if (metaDataMap == null) {
+                            metaDataMap = new HashMap<>();
+                        }
+                        Object value = method.invoke(cellValue);
+                        metaDataMap.put(method.getAnnotation(MetaData.class).name(), value);
+                    }
+                }
+
             } catch (Throwable e) {
                 row[i] = new DBDValueError(e);
             }
         }
 
-        rows.add(row);
+        rows.add(new WebSQLQueryResultSetRow(row, metaDataMap));
 
         if (rowLimit != null && rows.size() > rowLimit.longValue()) {
             throw new DBQuotaException(
@@ -101,7 +115,7 @@
         DBSEntity entity = dataContainer instanceof DBSEntity ? (DBSEntity) dataContainer : null;
 
         try {
-            DBExecUtils.bindAttributes(session, entity, resultSet, bindings, rows);
+            DBExecUtils.bindAttributes(session, entity, resultSet, bindings, rows.stream().map(WebSQLQueryResultSetRow::getData).collect(Collectors.toList()));
         } catch (DBException e) {
             log.error("Error binding attributes", e);
         }
@@ -122,15 +136,16 @@
         }
 
         // Convert row values
-        for (Object[] row : rows) {
+        for (WebSQLQueryResultSetRow row : rows) {
             for (int i = 0; i < bindings.length; i++) {
                 DBDAttributeBinding binding = bindings[i];
-                row[i] = WebSQLUtils.makeWebCellValue(webSession, binding, row[i], dataFormat);
+                row.getData()[i] = WebSQLUtils.makeWebCellValue(webSession, binding, row.getData()[i], dataFormat);
             }
         }
 
         webResultSet.setColumns(bindings);
-        webResultSet.setRows(rows.toArray(new Object[0][]));
+        webResultSet.setRows(List.of(rows.toArray(new WebSQLQueryResultSetRow[0])));
+        webResultSet.setHasChildrenCollection(resultSet instanceof DBDSubCollectionResultSet);
 
         WebSQLResultsInfo resultsInfo = contextInfo.saveResult(dataContainer, bindings);
         webResultSet.setResultsInfo(resultsInfo);
@@ -157,14 +172,14 @@
         // Convert original rows into new rows with leaf attributes
         // Extract values for leaf attributes from original row
         DBDAttributeBinding[] leafAttributes = leafBindings.toArray(new DBDAttributeBinding[0]);
-        List<Object[]> newRows = new ArrayList<>();
-        for (Object[] row : rows) {
+        List<WebSQLQueryResultSetRow> newRows = new ArrayList<>();
+        for (WebSQLQueryResultSetRow row : rows) {
             Object[] newRow = new Object[leafBindings.size()];
             for (int i = 0; i < leafBindings.size(); i++) {
                 DBDAttributeBinding leafAttr = leafBindings.get(i);
                 try {
                     //Object topValue = row[leafAttr.getTopParent().getOrdinalPosition()];
-                    Object cellValue = DBUtils.getAttributeValue(leafAttr, leafAttributes, row);
+                    Object cellValue = DBUtils.getAttributeValue(leafAttr, leafAttributes, row.getData());
 /*
                     Object cellValue = leafAttr.getValueHandler().getValueFromObject(
                         session,
@@ -178,7 +193,7 @@
                     newRow[i] = new DBDValueError(e);
                 }
             }
-            newRows.add(newRow);
+            newRows.add(new WebSQLQueryResultSetRow(newRow, row.getMetaData()));
         }
         this.bindings = leafAttributes;
         this.rows = newRows;