Projects >> Kundera >>3491e737287d25fbbfc28edbef947b3464611040

Chunk
Conflicting content 
        {
            logger.debug("Creating EntityManager for persistence unit : " + getPersistenceUnit());
        }
<<<<<<< HEAD:src/kundera-core/src/main/java/com/impetus/kundera/persistence/EntityManagerImpl.java
        this.factory = factory;
        this.persistenceContextType = persistenceContextType;
        this.transactionType = transactionType;
        this.persistenceCache = new PersistenceCache();
=======
        // session = new EntityManagerSession((Cache) factory.getCache());
        this.persistenceCache = new PersistenceCache((Cache) factory.getCache());
        
>>>>>>> 22a1baceffb70982443594b3baf36925996c70c0:src/jpa-engine/core/src/main/java/com/impetus/kundera/persistence/EntityManagerImpl.java
        this.persistenceCache.setPersistenceContextType(persistenceContextType);
        this.persistenceDelegator = new PersistenceDelegator(this.persistenceCache);
Solution content 
        {
            logger.debug("Creating EntityManager for persistence unit : " + getPersistenceUnit());
        }
<<<<<<< HEAD
        this.factory = factory;
        this.persistenceContextType = persistenceContextType;
        this.transactionType = transactionType;
        this.persistenceCache = new PersistenceCache();
=======
        // session = new EntityManagerSession((Cache) factory.getCache());
        this.persistenceCache = new PersistenceCache((Cache) factory.getCache());
        
>>>>>>> 22a1baceffb70982443594b3baf36925996c70c0
        this.persistenceCache.setPersistenceContextType(persistenceContextType);
        this.persistenceDelegator = new PersistenceDelegator(this.persistenceCache);
File
EntityManagerImpl.java
Developer's decision
Manual
Kind of conflict
Attribute
Comment
Method invocation
Chunk
Conflicting content 
    protected List populateUsingLucene(EntityMetadata m, Client client, List result,
            String[] columnsToSelect)
    {
<<<<<<< HEAD:src/kundera-core/src/main/java/com/impetus/kundera/query/QueryImpl.java
        String luceneQ = KunderaCoreUtils.getLuceneQueryFromJPAQuery(kunderaQuery);
        Map searchFilter = client.getIndexManager().search(m.getEntityClazz(), luceneQ,
                Constants.INVALID, Constants.INVALID);
=======
        String luceneQ = getLuceneQueryFromJPAQuery();
        Map searchFilter = client.getIndexManager().search(m.getEntityClazz(), luceneQ, Constants.INVALID,
                getMaxResults());
>>>>>>> 22a1baceffb70982443594b3baf36925996c70c0:src/jpa-engine/core/src/main/java/com/impetus/kundera/query/QueryImpl.java
        String[] primaryKeys = searchFilter.values().toArray(new String[] {});
        Set uniquePKs = new HashSet(Arrays.asList(primaryKeys));
Solution content 
    protected List populateUsingLucene(EntityMetadata m, Client client, List result,
            String[] columnsToSelect)
    {
<<<<<<< HEAD
        String luceneQ = KunderaCoreUtils.getLuceneQueryFromJPAQuery(kunderaQuery);
        Map searchFilter = client.getIndexManager().search(m.getEntityClazz(), luceneQ,
                Constants.INVALID, Constants.INVALID);
=======
        String luceneQ = getLuceneQueryFromJPAQuery();
        Map searchFilter = client.getIndexManager().search(m.getEntityClazz(), luceneQ, Constants.INVALID,
                getMaxResults());
>>>>>>> 22a1baceffb70982443594b3baf36925996c70c0
        String[] primaryKeys = searchFilter.values().toArray(new String[] {});
        Set uniquePKs = new HashSet(Arrays.asList(primaryKeys));
File
QueryImpl.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                mappedClass = appMetadata.getMappedClass(jpaQuery);
            }

<<<<<<< HEAD:src/kundera-core/src/main/java/com/impetus/kundera/query/QueryResolver.java
=======
            // pu = appMetadata.getMappedPersistenceUnit(mappedClass).get(0);
            
            kunderaQuery = new KunderaQuery(jpaQuery);
            
>>>>>>> 22a1baceffb70982443594b3baf36925996c70c0:src/jpa-engine/core/src/main/java/com/impetus/kundera/query/QueryResolver.java
            kunderaQuery.isNativeQuery = true;
            
            m = KunderaMetadataManager.getEntityMetadata(mappedClass);
Solution content 
                mappedClass = appMetadata.getMappedClass(jpaQuery);
            }

<<<<<<< HEAD
=======
            // pu = appMetadata.getMappedPersistenceUnit(mappedClass).get(0);
            
            kunderaQuery = new KunderaQuery(jpaQuery);
            
>>>>>>> 22a1baceffb70982443594b3baf36925996c70c0
            kunderaQuery.isNativeQuery = true;
            
            m = KunderaMetadataManager.getEntityMetadata(mappedClass);
File
QueryResolver.java
Developer's decision
Manual
Kind of conflict
Comment
Method invocation
Variable
Chunk
Conflicting content 
        void translate(KunderaQuery query, EntityMetadata m, ClientMetadata clientMetadata)
        {
            String idColumn = ((AbstractAttribute) m.getIdAttribute()).getJPAColumnName();
<<<<<<< HEAD

=======
           
            boolean useFilter = MetadataUtils.useSecondryIndex(clientMetadata);
>>>>>>> 22a1baceffb70982443594b3baf36925996c70c0
            for (Object obj : query.getFilterClauseQueue())
            {
                boolean isIdColumn = false;
Solution content 
        void translate(KunderaQuery query, EntityMetadata m, ClientMetadata clientMetadata)
        {
            String idColumn = ((AbstractAttribute) m.getIdAttribute()).getJPAColumnName();

            for (Object obj : query.getFilterClauseQueue())
            {
                boolean isIdColumn = false;
File
HBaseQuery.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable